diff --git a/issuer.enforce.dev/keys b/issuer.enforce.dev/keys
index def5d585..99b41a67 100644
--- a/issuer.enforce.dev/keys
+++ b/issuer.enforce.dev/keys
@@ -1,25 +1,18 @@
 {
   "keys": [
-    {
-      "kty": "RSA",
-      "kid": "a6b6dc1b51bac3fc1375108b79e21ebf4d7fdda626d6cc90bbe9aaa8f7865b31",
-      "alg": "RS256",
-      "n": "ygARXaUP8U7jJlLB0vMAmdZCXs0jAeG70BEO857dl1W6dT4cQDnh147M5GTLxu9yE1igB7lv2RlWigGhzdKGnL4II8byZPTitXQ8D61udV0SE3B8Cek22i5Kq20yBtJeiAUl5IY3Hj6cvG-ertae__Dqtw0ihqvubtmgFYmt687MUYmJBINIIt6gTanl69MlO5iLv_3NEgkDllxUfxigIGSGXpJMAs1GvraEKpTwtcRWUnvMQyraVvQK4Ktq1CI7B-PEJM4dAx4rB9CF4CaYz6OjhiG2C3F54ujBLBMagjIfU9nnExViPXhu1CuXPrwhXWaCaKUG8pXXxGlo2GcW1X1WxZ1X2O5QSQDgAxQYFQh-PanBjz1V04s4D2kOb6ybkTTEfNa9xMbcQTZ0nwzEOQOi3a9xOpjq_Fbx6Hf3zjYclWv0aETerbwEtaG7rhR9u-uenlRBP5v6ZkGtzBnRiH59avvaGbQDbqeG3ap-7oLsJCfFAqkdOpDuMO5cf3rpN9Asvy-KNQ-tqTUUyrxG0hg4gMrB5rtxGF9llTB25jykRjYp17QB9YThECrjAMf3QYg7kRFZsbhwp0nrF0v5qopnkQfGl8-ztvAYPXZm_fOo7aoMsaUU2sTCL1AX2yjRbZxskm3vLVaJgdn1WI4M5OFqG-8VbUqVmIDL-bNmwFM",
-      "e": "AQAB"
-    },
-    {
-      "kty": "RSA",
-      "kid": "cf7addad848c5eca8ace2d736ea062451d023da6b313ce3132974c428bef5969",
-      "alg": "RS256",
-      "n": "rS1j9m4bXybsznV9JSX0Pr1CTub8ku_Nz-xsktjMu5YES3gUCJLnI4kPtJpT728UwIOLa9rRv9e_cNzGZgiq97xJmA10XhV890598PI0RJzaPlhZ9SDx2z4kIiln-fcDl719rAXllWkv8OUA944GeKlenzzoxhKUbcVCpINe1GxEJ10wbM9v3x9NHPCyBBNq-pFiTK-TAtELXWe5susklgtiw-OQKpKRCeqvFZ_yBFWN3baBM4bKBbMM0Fo3zqyhgQd5m1NWjJpa3ZospeJ9Tc5ZEL7w8p0FuD4AcYJioDSmP0D-KyW2U5pM9BRZHnBZZa3dW_2ebelhGOb6tAIsiGRS3KcfvPso1e30G0_KJOQbTwHuwH_VF0z9sUfBMVqgLm0LOM8VPi2JUCKYYk0Ho1IeuvjMl-CBjlFQAAlF1qo4Pknz_EsDUSoemtdZ48k_xynRypzP4eO8qQAWRVIbGVggnna0hqyE9Z4H5qCcwvqYoEmaQYb8vAnMmVvTQU8TJhoPRj6br7MRBPb2Tk-Z6EjV-gBkq4ksLiZBTheu900A4otPKzEduPuK_B2VcD0WPKo4pqwdihphI4FGB8jY-H6yQmjS5alZQn4pXzrJ2gJPpu52NIR7ReB4XZVIFmJ6kuQEI7BHU5CvPe3-1U-wm8FLXIGXzEPDmHvPBF0Jlms",
-      "e": "AQAB"
-    },
     {
       "kty": "RSA",
       "kid": "874d440506faf96a878636f9a7f34d25ad538acd61070bc295054fe54aee3ddf",
       "alg": "RS256",
       "n": "zIqIFhr5rHfP46rbHgWTwopK3ENxDVtcvO1MzhbtDFroVc2NeOMxr7O4qmUgaHbqe5zmTY0Ks7dQSj7EyQswiTq3Zv8tI5z7Iwq1BezbYVT3wobM8JDyAmRwuF-lin1a4COUbVvaRVQMnvjcg9f5nHbmRWbFCfjcSaqjdcMq-rN6s8WwExpGgkSDMdQsgA5MHXDQVtPbT6ydMJiqIgzDzuntbZnSVOWZQOkYuyHWJeSN-ogqh_ezeBFidqud9o7zri2jAwIWqyHxpB8lpeyrmgH9NZGlHYzjsKAhnuQFr-OSaNYR5N_J-nXLs9TOx1REdbMD3AFVJk5ZIqqdSFUnqDjDVypxRKaRxxFx72b3KbqXohgF3ebbfDpfJTAA6ysFYfpN55E2ZXUKbiuMeUC-rInIsdIFPnNLX_YL5ixGW0pFHDZyV8U2rW7gFhdZ6vUxK577Z7BZL6_rTc3JeM2ykQ4mIuE1yglxaEvPNvLKSJGXj8LVJ0s_i1DECPES_AeOABbgXZXgmcB0B3BYAX86nxZuurFfZ0H8mWvflY6yFI1_0xn1yLBS6wqhSVNOORxABRk6kOZ61AYbF4yRXrafcVl2OpBpjHw9hLhj-MsSlIXFy992zWFAMzsyI0EF1g0fr93QZCxPI-G5ftIvp0CHiClckOnnsC0ekOc9BBYIcK8",
       "e": "AQAB"
+    },
+    {
+      "kty": "RSA",
+      "kid": "23bb2876562e7682fd1172f9f0302abacdf94303bae0113f32e56f4973d697d7",
+      "alg": "RS256",
+      "n": "1wDpvTn-HSdeBbHtOnECez_jAoFUueHoX5k_1WYC_MQUsieOhMvlzTzebkpr5rnC1n7zSX7CXqzCA9TtXZ_Y7CR4iMqvDTDpeztvvViLsa17F7ef06ts5gjt0pqXUyVH2D_A0LUDzVwwyWKoBA05Z0_Aa8x5Lcu2ezhhVe8dbi_H0vo0SQqVHwA3nofsch3yKQ5gsLtEqoXbp3YBzDNRMr4Z2h1fu2V2DiB26I3g9Z64EfU8jGiaMYc1cGOFogi2Bh0kk6wQ97vyo23xOj_tNJri0QB2iBpOp4hZic18gOJvcwf30SxSwshxaTpyat6aiPSLI328TCCR_RhA3Z-IyincS-sTSHTrHVUy7f-0YtYshS9Cy5SNu-L2iBOg2gciJXoTLz83mFXaIIv5u7u2X8Z9B1fAhMm5dzAxb32hal1BgoTZsILAMPEII6IXe_U7z1lGZMqmCuYxNLMK5RphMBv8lRjPNTazSkH0Q3ozl4lRs6R_cwtU6xf4ivRBF9mAicWScCdL6O8dYewQmoQ7zZEeaorqpA0q_I-uDIRjlBT-PCqUzHl_rLlWyNRjWssSM_7ihJaX91r69Xb2U3oRZMTQlbnDjJ4DaK7ShNUoHGY2pBxecNIkvB_2p2qb1XFe6GOuxQrQl0EaEqXHmOEkJ3QONZnTWKDiGKhOa8B7uZk",
+      "e": "AQAB"
     }
   ]
 }
diff --git a/login.microsoft.com/common/discovery/keys b/login.microsoft.com/common/discovery/keys
index 1e2e452e..188e4936 100644
--- a/login.microsoft.com/common/discovery/keys
+++ b/login.microsoft.com/common/discovery/keys
@@ -11,17 +11,6 @@
         "MIIC/jCCAeagAwIBAgIJAKysonliFZLIMA0GCSqGSIb3DQEBCwUAMC0xKzApBgNVBAMTImFjY291bnRzLmFjY2Vzc2NvbnRyb2wud2luZG93cy5uZXQwHhcNMjQwMjA4MTcwMjUzWhcNMjkwMjA4MTcwMjUzWjAtMSswKQYDVQQDEyJhY2NvdW50cy5hY2Nlc3Njb250cm9sLndpbmRvd3MubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvRIL3aZt+xVqOZgMOr71ltWe9YY2Wf/B28C4Jl2nBSTEcFnf/eqOHZ8yzUBbLc4Nti2/ETcCsTUNuzS368BWkSgxc45JBH1wFSoWNFUSXaPt8mRwJYTF0H32iNhw/tBb9mvdQVgVs4Ci0dVJRYiz+ilk3PeO8wzlwRuwWIsaKFYlMyOKG9DVFbg93DmP5Tjq3C3oJlATyhAiJJc1T2trEP8960an33dDEaWwVAHh3c/34meAO4R6kLzIq0JnSsZMYB9O/6bMyIlzxmdZ8F442SynCUHxhnIh3yZew+xDdeHr6Ofl7KeVUcvSiZP9X44CaVJvknXQbBYNl+H7YF5RgQIDAQABoyEwHzAdBgNVHQ4EFgQU8Sqmrf0UFpZbGtl5y1CjUdQq5ycwDQYJKoZIhvcNAQELBQADggEBAA57FiIOUs5yyLD6a6rWCbQ4Z2XJTfQb+TM/tZ6V6QqNhSS+Q98KFOIWe9Sit0iAyDsCCKuA8f08PYnUiHmHq8dG/7YRTShE/3zCZXHYKJgMaBhYfS788zQuq/hXDdVVc5X0pZwM4ibc6+2XpcpeDHxpMOLwo2AwujDdHVLzedAkIaTCzwPIizP4LB6l6IxR+xRXsH/1f034Gk3ReAEGgHW12NkajtXmC3DKl6vGIHvx1PgAMWQbxq3F2OopNx6aZEIIZWcMpQZ6/62f3pxRJHzZiJZN+khV8hpNjJvCNf6/hNbxkLcjLAycjW8AttcCRSTM4F+02S3TyHmoE4pYywA="
       ]
     },
-    {
-      "kty": "RSA",
-      "use": "sig",
-      "kid": "q-23falevZhhD3hm9CQbkP5MQyU",
-      "x5t": "q-23falevZhhD3hm9CQbkP5MQyU",
-      "n": "-9dXkqvGEcIba_TAwmY_ezbn6kLFl6ZMyR7XFCacMf6bBQ0CLlOy9KrDYxI5bm2XAb7qHMKb40d1CyAtO40BV1MZQdrkmLay7RFjQBV6SB24TrC4P0nNXWJCchzzlyesb6S3mqvWVaxRkTS3FkFC8UMsqg2itVcKJW1S2qQCOwF3Sug5GBPYezM_F56_ZfLBpA2aRHzE4eboWoiFjjXN9NqUELACl-DyfWXiyqehRIjuX6hG7lT2erkwWwFgFApi3W4zRtjCx5kRzZtqjDBLWYypBdBBFF8teaCjOq09RF05ZMRlzQKIORb0MxJw_XxVCzXPkKsdchZMBbH3PIuB4Q",
-      "e": "AQAB",
-      "x5c": [
-        "MIIC/TCCAeWgAwIBAgIINKBA6Wcz+Q4wDQYJKoZIhvcNAQELBQAwLTErMCkGA1UEAxMiYWNjb3VudHMuYWNjZXNzY29udHJvbC53aW5kb3dzLm5ldDAeFw0yNDAzMDYxNzAzMzJaFw0yOTAzMDYxNzAzMzJaMC0xKzApBgNVBAMTImFjY291bnRzLmFjY2Vzc2NvbnRyb2wud2luZG93cy5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD711eSq8YRwhtr9MDCZj97NufqQsWXpkzJHtcUJpwx/psFDQIuU7L0qsNjEjlubZcBvuocwpvjR3ULIC07jQFXUxlB2uSYtrLtEWNAFXpIHbhOsLg/Sc1dYkJyHPOXJ6xvpLeaq9ZVrFGRNLcWQULxQyyqDaK1VwolbVLapAI7AXdK6DkYE9h7Mz8Xnr9l8sGkDZpEfMTh5uhaiIWONc302pQQsAKX4PJ9ZeLKp6FEiO5fqEbuVPZ6uTBbAWAUCmLdbjNG2MLHmRHNm2qMMEtZjKkF0EEUXy15oKM6rT1EXTlkxGXNAog5FvQzEnD9fFULNc+Qqx1yFkwFsfc8i4HhAgMBAAGjITAfMB0GA1UdDgQWBBRRZhKrglETd/OCIUfwuGTRJkwNUTANBgkqhkiG9w0BAQsFAAOCAQEA46UCoAJlXMuxB/21GTP96KHx8zoYt2UnvCFxkLpRrkRThVBhTbd/txAYPb3eAGuhjJlNstKxfcCUaquKktQAdeGPA+Kn62DlksFaXjrcC0rGaiD+MiY2B/ATS0ebCYL3s3BJNmKKB9+1kbbcWCSQelcM2cNjJHJDqUhTyWMnTz4UK9RXwHFLq/T3yYP0qz/FZZR6RfCWzXz35SkZVObDMhPcyLgxy6CLMQotrtThsqn/2JZ7We/ehl6xCgVym6hfuv0Ju9WtZal+k46XDw2R3IoHJueB/vD0hLOqdZerwzD5OsCrTW2n3njN2nDHhCzlxGrhlleNDJhawFoxzSOuhQ=="
-      ]
-    },
     {
       "kty": "RSA",
       "use": "sig",