diff --git a/config/cert_bundles/ficam_bundle.pem b/config/cert_bundles/ficam_bundle.pem
index b11fad195..01c3244b2 100644
--- a/config/cert_bundles/ficam_bundle.pem
+++ b/config/cert_bundles/ficam_bundle.pem
@@ -4238,47 +4238,6 @@ U5Pb35+G6O78VcfalUjs8f4UyVU16fDh0T5jTYSR3qOHE4o3Bn+fJtHOv/3WALKF
 lOIlMZjVyJxM/uLXIGaMpkH+XltHFQ/WZrvbLLSs4PvhinY4ZSlkfcDrZG3/VwcQ
 SA==
 -----END CERTIFICATE-----
-Subject: /C=US/O=Entrust/OU=Certification Authorities/OU=Entrust Managed Services NFI Root CA
-Issuer: /C=US/O=U.S. Government/OU=FPKI/CN=Federal Bridge CA G4
------BEGIN CERTIFICATE-----
-MIIG5DCCBcygAwIBAgIUEhXZ0mT0ut2FShKo5CPz6FbxkqkwDQYJKoZIhvcNAQEL
-BQAwVTELMAkGA1UEBhMCVVMxGDAWBgNVBAoTD1UuUy4gR292ZXJubWVudDENMAsG
-A1UECxMERlBLSTEdMBsGA1UEAxMURmVkZXJhbCBCcmlkZ2UgQ0EgRzQwHhcNMjEx
-MTAzMTMxMjI0WhcNMjQxMTAzMTQxMjI0WjByMQswCQYDVQQGEwJVUzEQMA4GA1UE
-ChMHRW50cnVzdDEiMCAGA1UECxMZQ2VydGlmaWNhdGlvbiBBdXRob3JpdGllczEt
-MCsGA1UECxMkRW50cnVzdCBNYW5hZ2VkIFNlcnZpY2VzIE5GSSBSb290IENBMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1fyw54a+2cBXtH06x4HB6ECX
-sgVx/MJUQODXit/paoMSmlPjgnp8Ob0Hp+9t5REQ29l29mj9FZUoc8epuIqTyprx
-q4J27DYXPbSCf7tnLQJUp0WvjPewWqXZ8BIsiJL/HcgSYFNuRVoNaa+7nCkI3F3E
-liQW/WPA1q8Z3TOR/l6I9nSbrcQaJuF2YLzMSMhNvLbK2Ma2KwnxMsiKWrkGh0IP
-XQVrNYJtuYiOjfzVt0G4rHdAnpv6YZ8TsKSXfeiH9+qfuGuXKUKZvsGIDn0zMesc
-JZFV2b42pADg72lTQyZLQBGuIOh+1tYGzinI09iG+hNdIZjvlNS2BuK/bXxldQID
-AQABo4IDjTCCA4kwHQYDVR0OBBYEFPPtObnaG00DPCYVOdgztQjvOD45MB8GA1Ud
-IwQYMBaAFHnwAEnrf3fCXUECZTSKkCObHgdvMA4GA1UdDwEB/wQEAwIBBjAPBgNV
-HRMBAf8EBTADAQH/MIGlBgNVHSAEgZ0wgZowDAYKYIZIAWUDAgEDATAMBgpghkgB
-ZQMCAQMCMAwGCmCGSAFlAwIBAwMwDAYKYIZIAWUDAgEDDDAMBgpghkgBZQMCAQMO
-MAwGCmCGSAFlAwIBAw8wDAYKYIZIAWUDAgEDEjAMBgpghkgBZQMCAQMTMAwGCmCG
-SAFlAwIBAxQwDAYKYIZIAWUDAgEDJTAMBgpghkgBZQMCAQMmMIIBaQYDVR0hBIIB
-YDCCAVwwGwYKYIZIAWUDAgEDAQYNYIZIAYb6a4FIAwoHCDAbBgpghkgBZQMCAQMC
-Bg1ghkgBhvprgUgDCgcHMBsGCmCGSAFlAwIBAwMGDWCGSAGG+muBSAMKBwEwGwYK
-YIZIAWUDAgEDDgYNYIZIAYb6a4FIAwoHDjAbBgpghkgBZQMCAQMMBg1ghkgBhvpr
-gUgDCgcCMBsGCmCGSAFlAwIBAwwGDWCGSAGG+muBSAMKBwQwGwYKYIZIAWUDAgED
-DwYNYIZIAYb6a4FIAwoHDzAbBgpghkgBZQMCAQMSBg1ghkgBhvprgUgDCgcGMBsG
-CmCGSAFlAwIBAxMGDWCGSAGG+muBSAMKBw0wGwYKYIZIAWUDAgEDFAYNYIZIAYb6
-a4FIAwoHCTAbBgpghkgBZQMCAQMlBg1ghkgBhvprgUgDCgcDMBsGCmCGSAFlAwIB
-AyYGDWCGSAGG+muBSAMKBxAwYgYIKwYBBQUHAQsEVjBUMFIGCCsGAQUFBzAFhkZo
-dHRwOi8vbmZpcm9vdHdlYi5tYW5hZ2VkLmVudHJ1c3QuY29tL1NJQS9DQWNlcnRz
-SXNzdWVkQnlORklSb290Q0EucDdjMBIGA1UdJAEB/wQIMAaAAQCBAQAwDQYDVR02
-AQH/BAMCAQAwUQYIKwYBBQUHAQEERTBDMEEGCCsGAQUFBzAChjVodHRwOi8vcmVw
-by5mcGtpLmdvdi9icmlkZ2UvY2FDZXJ0c0lzc3VlZFRvZmJjYWc0LnA3YzA3BgNV
-HR8EMDAuMCygKqAohiZodHRwOi8vcmVwby5mcGtpLmdvdi9icmlkZ2UvZmJjYWc0
-LmNybDANBgkqhkiG9w0BAQsFAAOCAQEAI3igDIk79XF1stYBc7LrWffCyOP6/Wjr
-H0GJSFKWRVnxOt0qMYtqMf19PxuUoXTXUpg13A8j9C1ONSaC9oRgDxQd+hZR8gt5
-EoKXnRu95K94W7ABTdBPZDZ609g2eJ9a1ha0BYO3dd+k87cboMqw8KqEgdFm4lKt
-fDZIGbrgt758W9NBeLAkmZ+Py5d9l3ZhdBYS232elu8EGtkFL7YUs8rIBZuhuGI7
-yYHNcZzghmCLKQGplBqNRrEZQCQQ0BhRVqyLJ1XXGOoiPkjPQ39TPXbco/ZTUxfa
-HXF7bbYqvhDaKSZjUbYT8/BFi4xBjn7WsAeHpDLaCIxTww71hQ+RFQ==
------END CERTIFICATE-----
 Subject: /C=US/O=IdenTrust/OU=IdenTrust Global Common/CN=IGC CA 2
 Issuer: /C=US/O=IdenTrust/CN=IdenTrust Global Common Root CA 1
 -----BEGIN CERTIFICATE-----
diff --git a/config/cert_bundles/login_bundle.pem b/config/cert_bundles/login_bundle.pem
index 7962c744b..d1a79be5e 100644
--- a/config/cert_bundles/login_bundle.pem
+++ b/config/cert_bundles/login_bundle.pem
@@ -638,39 +638,6 @@ kuWsVs++VoD7Z+PXWza+2UbSDOiKmMpkfgR7Ik/74JCHLtT6YBqtv+MKXg55beYx
 8t50d1jl4sRKGrYpN2lpYvSWdOMy1jT5JtfFf39wTDnRm3uVxdQ9NQigMbnPdYrg
 ZKe4WuzZfXmt3Ojq
 -----END CERTIFICATE-----
-Subject: /C=US/O=U.S. Government/OU=DoD/OU=PKI/CN=DoD Root CA 3
-Issuer: /C=US/O=U.S. Government/OU=DoD/OU=PKI/CN=DoD Interoperability Root CA 2
------BEGIN CERTIFICATE-----
-MIIFRjCCBC6gAwIBAgICCHswDQYJKoZIhvcNAQELBQAwbDELMAkGA1UEBhMCVVMx
-GDAWBgNVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMQwwCgYDVQQL
-EwNQS0kxJzAlBgNVBAMTHkRvRCBJbnRlcm9wZXJhYmlsaXR5IFJvb3QgQ0EgMjAe
-Fw0yMTExMTYxNDU3MTZaFw0yNDExMTYxNDU3MTZaMFsxCzAJBgNVBAYTAlVTMRgw
-FgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsTA0RvRDEMMAoGA1UECxMD
-UEtJMRYwFAYDVQQDEw1Eb0QgUm9vdCBDQSAzMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAqewUcoroS3Cj2hADhKb7pzYNKjpSFr8wFVKGBUcgz6qmzXXE
-ZG7v8WAjywpmQK60yGgqAFFoSTfpWTJNlbxDJ+lAjToQzhS8Qxih+d7M54V2c14Y
-GiNbvT8f8u2NGcwD0UCkj6cgAkwnWnk29qM3IY4AWgYWytNVlm8xKbtyDsviSFHy
-1DekNdZv7hezsQarCxmG6CNtMRsoeGXF3mJSvMF96+6gXVQE+7LLK7IjVJGCTPC/
-unRAOwwERYBnXMXrolfDGn8KLb1/udzBmbDIB+QMhjaUOiUv8n3mlzwblLSXWQbJ
-OuQL2erp/DtzNG/955jk86HCkF8c9T8u1xnTfwIDAQABo4ICATCCAf0wHwYDVR0j
-BBgwFoAU//iuE4uSK3mSQaN2XCyBnprFnHgwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
-HQ8BAf8EBAMCAQYwRwYDVR0fBEAwPjA8oDqgOIY2aHR0cDovL2NybC5kaXNhLm1p
-bC9jcmwvRE9ESU5URVJPUEVSQUJJTElUWVJPT1RDQTIuY3JsMB0GA1UdDgQWBBRs
-ipSid7GAch2Behaq8tzOZu5FwDB8BggrBgEFBQcBAQRwMG4wSgYIKwYBBQUHMAKG
-Pmh0dHA6Ly9jcmwuZGlzYS5taWwvaXNzdWVkdG8vRE9ESU5URVJPUEVSQUJJTElU
-WVJPT1RDQTJfSVQucDdjMCAGCCsGAQUFBzABhhRodHRwOi8vb2NzcC5kaXNhLm1p
-bDB2BgNVHSAEbzBtMAsGCWCGSAFlAgELJDALBglghkgBZQIBCycwCwYJYIZIAWUC
-AQsqMAwGCmCGSAFlAwIBAw0wDAYKYIZIAWUDAgEDETAMBgpghkgBZQMCAQMnMAwG
-CmCGSAFlAwIBAygwDAYKYIZIAWUDAgEDKTAPBgNVHSQBAf8EBTADgAEAMEoGCCsG
-AQUFBwELBD4wPDA6BggrBgEFBQcwBYYuaHR0cDovL2NybC5kaXNhLm1pbC9pc3N1
-ZWRieS9ET0RST09UQ0EzX0lCLnA3YzANBgkqhkiG9w0BAQsFAAOCAQEA3JcZOu+p
-kyQIa0PiobysCGeofXyVVi79uJBjQlBdkSr/s3dUUGaxDSVi28wFtfVw1Zmgx6nn
-wz5zHF2besBVi4L9U1MfezK4+gznA1s80PfPUBUMV2oKIGj7n+F0nIB0zk5Q7HW5
-cVWFKXkbnfiT+OUAUfXWLBuE8KbuLu5HiW//qaItC5nTpfgc2wRo6/LegIYIbA9q
-pfXuAhv00+mZY8Z/+PePbgNKshAC6467SycJz5/GAcIeD6wlqqAS6gC5nryvTNTz
-AGK3xGGdAu/vxbq3ouyOcwf8slJUFl2+HmaxnrNVs1l+tw0XjClPDDkYzUwN1QCO
-WK+4RVQg0gSgAw==
------END CERTIFICATE-----
 Subject: /C=US/O=DigiCert, Inc./CN=DigiCert Class 3 SSP Intermediate CA - G4
 Issuer: /C=US/O=U.S. Government/OU=FPKI/CN=Federal Bridge CA G4
 -----BEGIN CERTIFICATE-----
@@ -2646,6 +2613,39 @@ ypxEajZkmamhdXnr0/+vpkZ/jqVsp2kma3j9gyK22/wRDnCjl+Q93B03MJolTGz5
 X/LiycNJiXp+yTMqYtVzN/GZUmsgoAh1W0LGqi9fZtHqywxxz0dnNr9RmcDgrwPO
 U1r0msLhtAUizDcUef4t7/RjV0heemM=
 -----END CERTIFICATE-----
+Subject: /C=US/O=U.S. Government/OU=DoD/OU=PKI/CN=DoD Root CA 3
+Issuer: /C=US/O=U.S. Government/OU=DoD/OU=PKI/CN=DoD Interoperability Root CA 2
+-----BEGIN CERTIFICATE-----
+MIIFRjCCBC6gAwIBAgICCwAwDQYJKoZIhvcNAQELBQAwbDELMAkGA1UEBhMCVVMx
+GDAWBgNVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMQwwCgYDVQQL
+EwNQS0kxJzAlBgNVBAMTHkRvRCBJbnRlcm9wZXJhYmlsaXR5IFJvb3QgQ0EgMjAe
+Fw0yNDEwMDgxNDMxNDNaFw0yNzEwMDkxNDMxNDNaMFsxCzAJBgNVBAYTAlVTMRgw
+FgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsTA0RvRDEMMAoGA1UECxMD
+UEtJMRYwFAYDVQQDEw1Eb0QgUm9vdCBDQSAzMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAqewUcoroS3Cj2hADhKb7pzYNKjpSFr8wFVKGBUcgz6qmzXXE
+ZG7v8WAjywpmQK60yGgqAFFoSTfpWTJNlbxDJ+lAjToQzhS8Qxih+d7M54V2c14Y
+GiNbvT8f8u2NGcwD0UCkj6cgAkwnWnk29qM3IY4AWgYWytNVlm8xKbtyDsviSFHy
+1DekNdZv7hezsQarCxmG6CNtMRsoeGXF3mJSvMF96+6gXVQE+7LLK7IjVJGCTPC/
+unRAOwwERYBnXMXrolfDGn8KLb1/udzBmbDIB+QMhjaUOiUv8n3mlzwblLSXWQbJ
+OuQL2erp/DtzNG/955jk86HCkF8c9T8u1xnTfwIDAQABo4ICATCCAf0wHwYDVR0j
+BBgwFoAU//iuE4uSK3mSQaN2XCyBnprFnHgwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAQYwRwYDVR0fBEAwPjA8oDqgOIY2aHR0cDovL2NybC5kaXNhLm1p
+bC9jcmwvRE9ESU5URVJPUEVSQUJJTElUWVJPT1RDQTIuY3JsMB0GA1UdDgQWBBRs
+ipSid7GAch2Behaq8tzOZu5FwDB8BggrBgEFBQcBAQRwMG4wSgYIKwYBBQUHMAKG
+Pmh0dHA6Ly9jcmwuZGlzYS5taWwvaXNzdWVkdG8vRE9ESU5URVJPUEVSQUJJTElU
+WVJPT1RDQTJfSVQucDdjMCAGCCsGAQUFBzABhhRodHRwOi8vb2NzcC5kaXNhLm1p
+bDB2BgNVHSAEbzBtMAsGCWCGSAFlAgELJDALBglghkgBZQIBCycwCwYJYIZIAWUC
+AQsqMAwGCmCGSAFlAwIBAw0wDAYKYIZIAWUDAgEDETAMBgpghkgBZQMCAQMnMAwG
+CmCGSAFlAwIBAygwDAYKYIZIAWUDAgEDKTAPBgNVHSQBAf8EBTADgAEAMEoGCCsG
+AQUFBwELBD4wPDA6BggrBgEFBQcwBYYuaHR0cDovL2NybC5kaXNhLm1pbC9pc3N1
+ZWRieS9ET0RST09UQ0EzX0lCLnA3YzANBgkqhkiG9w0BAQsFAAOCAQEAG4XwYu2n
+R/WbM/oNwBbAf/JQCWDrbdR+0BTVgdYDy5BY8ENr4rFUjvy5DASMyxfEGNzl5NTf
+SumYpZn+HyfDsyzz68iXketTZQWJV+OQPvJuJGeq0pAx9OKqhV5xYD0tJteyTDqp
+cb/x2AdwwUx9WoKKcQvsgsPmYHscTWoWVosGiCTf/d/fdsv0JDbU/tVmdRtJRZd9
+RLY0AX2uMAWPWmXE2kh78gTSTB6HDkipWtiTQWrGAlsG/nBqhWEPKgGMKasAPFXx
+sstC5uJlgvusbPf+59eCthCBhdQ2AoOKrUJq1igenJUkrTnCRbWPgTZPF7sVUgye
+nC8YfDpmpw6cRg==
+-----END CERTIFICATE-----
 Subject: /C=US/O=ORC PKI/CN=WidePoint SSP Intermediate CA
 Issuer: /C=US/O=U.S. Government/OU=FPKI/CN=Federal Common Policy CA G2
 -----BEGIN CERTIFICATE-----
diff --git a/config/certs/C=US, O=U.S. Government, OU=DoD, OU=PKI, CN=DoD Root CA 3.pem b/config/certs/C=US, O=U.S. Government, OU=DoD, OU=PKI, CN=DoD Root CA 3.pem
index 5aed3c13d..e33eb9b83 100644
--- a/config/certs/C=US, O=U.S. Government, OU=DoD, OU=PKI, CN=DoD Root CA 3.pem	
+++ b/config/certs/C=US, O=U.S. Government, OU=DoD, OU=PKI, CN=DoD Root CA 3.pem	
@@ -1,10 +1,10 @@
 Subject: /C=US/O=U.S. Government/OU=DoD/OU=PKI/CN=DoD Root CA 3
 Issuer: /C=US/O=U.S. Government/OU=DoD/OU=PKI/CN=DoD Interoperability Root CA 2
 -----BEGIN CERTIFICATE-----
-MIIFRjCCBC6gAwIBAgICCHswDQYJKoZIhvcNAQELBQAwbDELMAkGA1UEBhMCVVMx
+MIIFRjCCBC6gAwIBAgICCwAwDQYJKoZIhvcNAQELBQAwbDELMAkGA1UEBhMCVVMx
 GDAWBgNVBAoTD1UuUy4gR292ZXJubWVudDEMMAoGA1UECxMDRG9EMQwwCgYDVQQL
 EwNQS0kxJzAlBgNVBAMTHkRvRCBJbnRlcm9wZXJhYmlsaXR5IFJvb3QgQ0EgMjAe
-Fw0yMTExMTYxNDU3MTZaFw0yNDExMTYxNDU3MTZaMFsxCzAJBgNVBAYTAlVTMRgw
+Fw0yNDEwMDgxNDMxNDNaFw0yNzEwMDkxNDMxNDNaMFsxCzAJBgNVBAYTAlVTMRgw
 FgYDVQQKEw9VLlMuIEdvdmVybm1lbnQxDDAKBgNVBAsTA0RvRDEMMAoGA1UECxMD
 UEtJMRYwFAYDVQQDEw1Eb0QgUm9vdCBDQSAzMIIBIjANBgkqhkiG9w0BAQEFAAOC
 AQ8AMIIBCgKCAQEAqewUcoroS3Cj2hADhKb7pzYNKjpSFr8wFVKGBUcgz6qmzXXE
@@ -23,11 +23,11 @@ bDB2BgNVHSAEbzBtMAsGCWCGSAFlAgELJDALBglghkgBZQIBCycwCwYJYIZIAWUC
 AQsqMAwGCmCGSAFlAwIBAw0wDAYKYIZIAWUDAgEDETAMBgpghkgBZQMCAQMnMAwG
 CmCGSAFlAwIBAygwDAYKYIZIAWUDAgEDKTAPBgNVHSQBAf8EBTADgAEAMEoGCCsG
 AQUFBwELBD4wPDA6BggrBgEFBQcwBYYuaHR0cDovL2NybC5kaXNhLm1pbC9pc3N1
-ZWRieS9ET0RST09UQ0EzX0lCLnA3YzANBgkqhkiG9w0BAQsFAAOCAQEA3JcZOu+p
-kyQIa0PiobysCGeofXyVVi79uJBjQlBdkSr/s3dUUGaxDSVi28wFtfVw1Zmgx6nn
-wz5zHF2besBVi4L9U1MfezK4+gznA1s80PfPUBUMV2oKIGj7n+F0nIB0zk5Q7HW5
-cVWFKXkbnfiT+OUAUfXWLBuE8KbuLu5HiW//qaItC5nTpfgc2wRo6/LegIYIbA9q
-pfXuAhv00+mZY8Z/+PePbgNKshAC6467SycJz5/GAcIeD6wlqqAS6gC5nryvTNTz
-AGK3xGGdAu/vxbq3ouyOcwf8slJUFl2+HmaxnrNVs1l+tw0XjClPDDkYzUwN1QCO
-WK+4RVQg0gSgAw==
+ZWRieS9ET0RST09UQ0EzX0lCLnA3YzANBgkqhkiG9w0BAQsFAAOCAQEAG4XwYu2n
+R/WbM/oNwBbAf/JQCWDrbdR+0BTVgdYDy5BY8ENr4rFUjvy5DASMyxfEGNzl5NTf
+SumYpZn+HyfDsyzz68iXketTZQWJV+OQPvJuJGeq0pAx9OKqhV5xYD0tJteyTDqp
+cb/x2AdwwUx9WoKKcQvsgsPmYHscTWoWVosGiCTf/d/fdsv0JDbU/tVmdRtJRZd9
+RLY0AX2uMAWPWmXE2kh78gTSTB6HDkipWtiTQWrGAlsG/nBqhWEPKgGMKasAPFXx
+sstC5uJlgvusbPf+59eCthCBhdQ2AoOKrUJq1igenJUkrTnCRbWPgTZPF7sVUgye
+nC8YfDpmpw6cRg==
 -----END CERTIFICATE-----