diff --git a/issuer.enforce.dev/keys b/issuer.enforce.dev/keys
index 521b4f6b..478e179d 100644
--- a/issuer.enforce.dev/keys
+++ b/issuer.enforce.dev/keys
@@ -1,33 +1,5 @@
 {
   "keys": [
-    {
-      "kty": "RSA",
-      "kid": "5f8cc6f40053aca16a8d12b8e92ba17051dd347de9f750e9bcfd5927572ab279",
-      "alg": "RS256",
-      "n": "r6PvKNnW0URgc85eGy07X1EqyPG5xQk3_hS02DSN6_ETyxmk5j8RkN5hSrTNFW1H5KfKZ9jO__ml6DVkJGDKY_I4kZbYUTpe54wEmeuDmV243cDP0-GmUOQPNKfuC6rf_uzA7TS1sM46qsAmmkmI3CQ_8OcW5v5vXSrrfy0V_eyaDDbH8ViOrujw8EOX8GEVBlROSvowNUue3UxJMTedOdVgdJopkIHTtRP-aAdL3tla_cvk1DWZaOmyYan_oRJAWG-2VCKu93SKWvGOmUOZT000kMgIWhslr8QXRRMbgG489RtxLiom0LxgIVihtx_rFVtfFwR2AqOgp6m7JhqJFa-T3z8YZKzqymOZBSAEv24y7EmyVabqqv58QqctwBiCBMuuqoNH8O6LBbYNwaoa6ipnv3dX8UtdHUO12ablPJaMA0cGWWx2NOzrT8Fib1as21R6YOpAMth2xrpVLb21fonpCCcLEb7jAH-BwJw9I8uw8tAuEbuMjZTB83n_25vbkUAzyAl5tqj_gAPp-0UdUawTpYZW9mdxBcbKPwdmHDEL92rZFBqP3HHBUAT6ELd-LjAJP9-80cHtIt0yf9GcvI80jbf3RqhtR1nJltrCa0sCO8itmKjOJ_45phCstSK_2LrXUQ_yojpvczUhhGDZxxommE1c0I2OvNzl9wUT0pk",
-      "e": "AQAB"
-    },
-    {
-      "kty": "RSA",
-      "kid": "af313e48b86fa7e97179c93fcc5200b2fffa9d397a6a1aff85e89e06602baeb9",
-      "alg": "RS256",
-      "n": "qbfEkZhuYDt6-MOkmBahLndbXO_jBMgDod-B6E20JJXlrd3B89C-U4Hszi_sRYuB021Z5YJ3FktMBwmRwcx-ULQpY25AT2nsl6xXglIRFhlwv7cU0J3_tKwD7QI9TFUARry8dOY71HIyBr2P6YOb6RYYyu9cyF-TVcGdDD18VONRXw8xIozwzuO-7fGcLFVfdqVcjA2H_MU1Euxrz5SazapNsCmelH16Od48oiR7E1GoqPxJS0luN8p9s6Dpvk7tKUrIp8Q777LtM5-DRnzGWH-ihfIJh9EQRlY8qUsxsVPO0Plkgfom21xSktalBjavhMuiCUi8RyNB80uJpN_zhOiBdBJ3yLB6b7UCEsZ31dks_PwYoBcu613vu2ZHRYIg5SlGODJUEbE2kbmZS3d33bKDLfb8dFNUDCZBhfMHKAcVTcfv_JGUVQCIoQi1pOD_JDWjLVjgq8esMOuSk7hpm04Q1ZpxIljnDMI3c98MrPwtur9L1Hb1_PVS64IbuiaAthA5mexNLgZ-IAEOubSvgTNzxdrUA2W-TD5ovYE5eVKrTsQTEc0ZJDOtaYlkUWVZQAFCiOXHJrIY9CDvh4CvJkwwIRjyV6JPY4eg0LTJ0G1V6UVXTMyzIPmAmNOe-uAWhs55aPh9G1uywgpOzI3QdR68D8zM6eREDi8thcrVXu0",
-      "e": "AQAB"
-    },
-    {
-      "kty": "RSA",
-      "kid": "123c2607fe253edce6d07db8984c5feecb7710b0470fadd8bb53afc6e629e887",
-      "alg": "RS256",
-      "n": "snSqBfK7yV9PUHvcfgKj0Q0rVIl_XsHJueohPv_t27byHC94QKVC_8M6JPDFet_lJRNKokIUh3rrrzb0gVvVWALFp9M7i9qBWdZFeUvS9PD9ZNWRKDJNLjOFSMh7qFgygDtUIwhCK3PhDwhmYYJ-JylGhlsLwYyUDr1TUQMfhB76SRFNw2ifotAR2hadl9IRcyinDcDiZrJcSxrcc67tpVZa9ChvzCLQ3WJGUpnEJMyv1rLJh4iI5EUtSPvHgAmBzgFIQ24853iJ-3mJkPK1-9QfNeBYw6SxBO8aEtEKCh25wvDTrgSmBoguXfixjrvGWSHhPvSnoF1lm40YsjQIXtl3B3NdD_uQcF695QoIHj7uhIO3haKsteD9Sktz_kbPx0jcOOy8qJR2ELLSoadAxJzUmzh_oFD3_-m_zqXVnksBEFUQW1a01_4gjwSPx3u8_o8AouT2SnkhJCMyU4QU7Pv_y2RH_YGmqwlmG2Dt2-8YBFCs4iZHxexZSE32J3zLbABmTQHRlQA1gGu9IDcGtd8s6xYYFlHEpu7EZLIOMdLGU5v6kYwEeaPJ0RC6dEz6JToeXxHraaku4uebcvxrQGB_MPkxkUFv5N9lGeeIdzk51ZVDSf566thZX_fJHs_GNqgXlha_TTl0cGXN-n282jL5l1K7YR1FkcK6UXoh0R8",
-      "e": "AQAB"
-    },
-    {
-      "kty": "RSA",
-      "kid": "c49e54f38f470aaba321c42ce22fb61de344036f5e386cb5e5928051436f6a32",
-      "alg": "RS256",
-      "n": "4EAxkDzkMDhPty40PtDYHqgq_OPCNvhBgIgAnxv1FL3TTWPiNIvWtyuIjR8Z3qK6yQeJ12yrFCz4BV3ozt3CKn6WlALClRTBH-V8CINxzK4nd1U8I5MzgbrPjkF6kepJWJyQob0GKOGp31JR8wqycWpDIRyJ5ZiN0drxzYAK3M41JVPJEQZh_4EkRpU9rpd6qHIIxMRd-bLHkuOoJyhkMPIJQnni54LJ8fx2MUCTyCKFJlAu17SAPVsCmQ1zcOMVXaSBhSJWDBJj47uHan6oc0JRG5sTteUub_mxLKabtxeBZwfeliyTjYVvcIsSLm1O8MPPphIu0gfd-XNQUQF7cBJVOWkqkyyr_92oZdyy-_dEYzlETokCrrnJwT6yyIZMSVllHdkQCraZ6X-bT90H9LDicIpgIRUIQleFXuiaFdPkMThT0GXTTgWwF2SgORkqpHwGaJLgku-uCmYzajUR-wAtxL6mESp0Qrp3faj4CXMFeE_5sDAmOY7gMNR3x5Lo77BoIQx11DTvGKKpNjBSPeJYGm7JNUvPgzx_W5mXcPuHihnbYFvv7GGGGl1RqZ6DRcgsHSdXqxHo0emAz1kAkhQctJJnig1LILupPouWYvpOSkvgnf3wY3udl8hElBHj6h0-KlqQcG2-nz9ieLc16Zwwb97Upex_P0WN5Dkc3fk",
-      "e": "AQAB"
-    },
     {
       "kty": "RSA",
       "kid": "c110e1ac464fcc9be976aabbe41eb797a186115d741ea9e9d6c9f3afe719a2fc",
@@ -41,6 +13,20 @@
       "alg": "RS256",
       "n": "vuwgY1Kd7j3_GxMEevfD0wxRZb0mCioAzpYo7p_YQOwZmvDHUiXSmceCMMwf5d6MzF4B6Kkj4lBLeVSfgRKXfGUpHh3VvySroqys5EFcUQ_Gh6yyHJGKCNrmy0vhSRAwNffkQeGeW7VCZlbEQn-p1v9TSdeYY0wlMRbaqTusP0fs8bj8FmDhGRIWgqasaf4B0RWc1SR2OndPEEF0Z9LRsm600spDBbX4VrN_T4cawd2FIHiHQsEnNb7pia7N7Gi5dBWai0ct8waCwM_uHIlxJQ2GFRkTUp_htytVwEK2i0_wptqCOKoe3OZJWnmw9qrCBL6BInnx7B6ASr-FBnH8A-qLwM_dLgvIOTFp_AzpXt6HSBsX3vvhd9zpx8zmqR0kNjn9btcr2LqyPh-XmMcqlhfpb0nLS6g1oq0K9VdQmwKotSG7vjQcKDG0W_KbcwNlOPwj34FGTcO6CGJ4YAOewvCgpT9XOBfAuYGgAJlJuL91ulNY3M0p_l2juuQuYWpbZDekd9fuknllhC6jB7rL1pHG_OYeJL4OgFk8P6TijAcUX-U4InTSYZP7bUy0ZM3v1d5goSpJESbLzYNryfbsgjSioHqkW_P-AweNq5txtwInEnAd0JGPNupnzaYSI-fAOgLJ7XdFcVU62F3KiMhaD45KkMQUUFXLL5KYlMXZe0k",
       "e": "AQAB"
+    },
+    {
+      "kty": "RSA",
+      "kid": "56533129a7e187e35153993fa3eeb2a6d91acc5e01cf1ffec5d49655cf8869f2",
+      "alg": "RS256",
+      "n": "8canq2-2awdrw7nF6ZQhXy6UuhNDUjn0SxV_SX0lE_qxnwLzj11qCz4QtrbzNw1zoZkKuGNvhyBKYa8V8KV3id0fS7t1A_FtBDgoaJ-AF5oq6O26-TePc01Tsf_vAIRVpmJQRx3iYPHo6gCgigffeM8jsZ6HsHg1FE6Po0XIvFNWz3YM_MqWeB5SzWUGbrbfJ8HthZBoVUFbia54k6FIT05PC_hl4pl5AbWWuIfOxkQpO2rJXDB8Lc1pe0pJ2tUbtjyn5Ql72Z6VMNBXCwXxCrR5a3wYrdMWE16lL-qYNpH3CfSUyGRUqLci0YvePqpVwZAWVhDJoIY0ufyNiIo_vOSIG7ny1oeb0_5vIbtlaw5QWzrXwbXLB86KH5d1ojMcglXXoIHyxsxT51a0O_VcyRD2Y33_PYSZujSkO51lxB2KV2bw-TOoquVCsiNVACCBQI6M9KezScMbEJKsBCDh2MsZlEirdLjG8f7e9DxViYW_IOD7OWpIXzdrIy4tAb9lBrERGaRmsHm3vLpd8pPuk64wOPe80PC9SP1CuZquvzZegAh7CevX8VGjanin8bfBJA6K4-7oXSzD3p0Ve2R8gjGgL4_vOZf61cR5csGc5MT-Zrqn0k0OPbkWZFS2clO4KzxPFehxXi4IDdkk2DdQm6haN1l0iBXd_UODNpVIDe0",
+      "e": "AQAB"
+    },
+    {
+      "kty": "RSA",
+      "kid": "b3dd4bd2bd3efc7d9ba857435256872b096d4ccebe769812901119b42f383cf8",
+      "alg": "RS256",
+      "n": "nBnJ17qQB5tpUv-NkmPWuImcHm0qNvoRDyAndo9_hHqEGXwpzHUf7v67bvZ7idwnWcwL7dTCuvrJ9pqu2z1kWZ0Ku1PcaL0WgWMckG7NeJwEq6eU8gchZxPm-09K5176KWqeoQb7CX-xyxgEeN4mYOhbX5r1feRw6XmGk6cgjzPmo7Fj132I1IYP0izqz6PXcb6C6UgcXsdjsYgLRgo-ZZwZ1XGfEqO1Jn_r1MKRi6rWt69HnpwHpsIOFufPB2MYKY9grfHgUiDFYfwWYw5JdVPTndH5ETxb32p9U5xvykKCvP1LdfL3h7x5Xa27jA46WMclNmOxEreke2J83FL4JmiI3BkT7X2kCZtmYomMqkfUUlmg4GnMCKKY1sNEBUrAIz_mP0eFRSA8y82vT6k4tzDHF_pCneuTTDkdoInrbYvUxxQ06_sTi8D02sp9y9jGfbqIIel9rqJ1GaveeSrDT0ELoo2lHuqskJDoN-2NgvXCVFQW4fE2eZY1HoF8wg7aoBWPiEKu99s1mKj-N7nsdhACYAsJoyaYXrwLukLNR9RG2puPYEYgJLvojR3Xf7eRPb0-8Pc1zfhAZpw8we8bqqoiLhQavnisKt9AslbxuPZltr78hCRtWfpWy6nlKp4hhqFD-gJPcdjlDfecQBRTZnDBECXb-Irdln-MVCjSnbM",
+      "e": "AQAB"
     }
   ]
 }
diff --git a/login.microsoft.com/common/discovery/keys b/login.microsoft.com/common/discovery/keys
index a9b13adc..37d2e7bb 100644
--- a/login.microsoft.com/common/discovery/keys
+++ b/login.microsoft.com/common/discovery/keys
@@ -11,17 +11,6 @@
         "MIIC/TCCAeWgAwIBAgIISlx9oAuA2/MwDQYJKoZIhvcNAQELBQAwLTErMCkGA1UEAxMiYWNjb3VudHMuYWNjZXNzY29udHJvbC53aW5kb3dzLm5ldDAeFw0yMzEyMDUxNzE2NTdaFw0yODEyMDUxNzE2NTdaMC0xKzApBgNVBAMTImFjY291bnRzLmFjY2Vzc2NvbnRyb2wud2luZG93cy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDft/FsFDx4A/vOeqTwHyRTBUUR1Xs3xZdJ+WiMcl/200LKqsx3iCwC7hFTOHCUGUAfBguGbAw2BGz4HiAuwRRpYlSPHk7g3Fx+iQL7pMvWn8igswZ6rAU4xIG3FrU6ecvd4BAPUPs7Sk6MkGy3X9Jk+zCF1XNMQahah3/W8wUO7TZ3eiA/+26/bOXkl33a3Xti6pvrXAMovMegJ5QxNUTNBLjifSZetYmeJpjT7/OzyinDCZQdFbckn+bSLkHWb2UWZxVRQqHlVhk9p5zl10I7jsn3WdmLS1yAAOGo/OEAkXbRwES+QI/2RImKK/ayx52URtNJkZBO4Ls6U/0by2+9AgMBAAGjITAfMB0GA1UdDgQWBBR6Y4Oi5GGItIomQ0yZfH/woCAogzANBgkqhkiG9w0BAQsFAAOCAQEAaNbWUtHv3+ryZecDc7m6V1V1rWrVkUwC2QO78a2TprEN3owOeP0IHP42fbd/wcSsufTTtkk/J+fqL5dtsQ6zk2kDQfY5CgOyVCsaxVqHsg3t8fAWBkHiNScjZvRhLx4ll9QMOtLAwL4Os3Of0qtvP61zONP9sCJoUB6hkB33SRma1OyPZnYK/l3r0Y49+Ov0wahcdI4yZI72hFXlyyLnOT8dMbJDwZ9LNXA/BauEff4qTI4nIQk/lQKS6BjHzvXZbkHYEV/6M7r1g1syeahDmnaII+ZiBwp6tmAZKZC0Q0O7y3DmcPrHiZdv35AHadZY5cGWy1rw8NIMkaHWZ0mP6Q=="
       ]
     },
-    {
-      "kty": "RSA",
-      "use": "sig",
-      "kid": "kWbkaa6qs8wsTnBwiiNYOhHbnAw",
-      "x5t": "kWbkaa6qs8wsTnBwiiNYOhHbnAw",
-      "n": "t6Q2XSeWnMA_-crH2UbftfS01QDAqHoPQFqsRtVkxG4eyamnNlTl3Da07QQkjpPEbLoLtgtMI2Pr0plO7xU9f94mhbfK_UJ6Y0KcWxhwKMkCgnzcFOQF4eH_AICHLOKa8vPthtcprNcCmjbksW5TYBZi6uLhFLw_HsjGOxhK0VaDWnWizNVeqvzVB0jt9Vdmfhs6Zohy_1b2Wusdad1NmSKzhC74IDjlIaFoik_ZJJdtLOgoIwOZTLW0M1UKhRrWtj7AjVCnE_zBiloACm1IrIM_PymE10cJJ6WFz29ep4g7X65xCEU6zJ5oIFibvk6cKKcFNB7FFjbehYVpw5BxVQ",
-      "e": "AQAB",
-      "x5c": [
-        "MIIC/TCCAeWgAwIBAgIICHb5qy8hKKgwDQYJKoZIhvcNAQELBQAwLTErMCkGA1UEAxMiYWNjb3VudHMuYWNjZXNzY29udHJvbC53aW5kb3dzLm5ldDAeFw0yNDAxMTUxODA0MTRaFw0yOTAxMTUxODA0MTRaMC0xKzApBgNVBAMTImFjY291bnRzLmFjY2Vzc2NvbnRyb2wud2luZG93cy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3pDZdJ5acwD/5ysfZRt+19LTVAMCoeg9AWqxG1WTEbh7Jqac2VOXcNrTtBCSOk8Rsugu2C0wjY+vSmU7vFT1/3iaFt8r9QnpjQpxbGHAoyQKCfNwU5AXh4f8AgIcs4pry8+2G1yms1wKaNuSxblNgFmLq4uEUvD8eyMY7GErRVoNadaLM1V6q/NUHSO31V2Z+GzpmiHL/VvZa6x1p3U2ZIrOELvggOOUhoWiKT9kkl20s6CgjA5lMtbQzVQqFGta2PsCNUKcT/MGKWgAKbUisgz8/KYTXRwknpYXPb16niDtfrnEIRTrMnmggWJu+TpwopwU0HsUWNt6FhWnDkHFVAgMBAAGjITAfMB0GA1UdDgQWBBQLGQYqt7pRrKWQ25XWSi6lGN818DANBgkqhkiG9w0BAQsFAAOCAQEAtky1EYTKZvbTAveLmL3VCi+bJMjY5wyDO4Yulpv0VP1RS3dksmEALOsa1Bfz2BXVpIKPUJLdvFFoFhDqReAqRRqxylhI+oMwTeAsZ1lYCV4hTWDrN/MML9SYyeQ441Xp7xHIzu1ih4rSkNwrsx231GTfzo6dHMsi12oEdyn6mXavWehBDbzVDxbeqR+0ymhCgeYjIfCX6z2SrSMGYiG2hzs/xzypnIPnv6cBMQQDS4sdquoCsvIqJRWmF9ow79oHhzSTwGJj4+jEQi7QMTDR30rYiPTIdE63bnuARdgNF/dqB7n4ZJv566jvbzHpfCTqrJyj7Guvjr9i56NpLmz2DA=="
-      ]
-    },
     {
       "kty": "RSA",
       "use": "sig",