diff --git a/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/FrontPage.feature b/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/FrontPage.feature
index 7e3cc122d1..bcf59f4e29 100644
--- a/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/FrontPage.feature
+++ b/src/OpenConext/EngineBlockFunctionalTestingBundle/Features/FrontPage.feature
@@ -13,6 +13,7 @@ Feature:
     Then I should see 8 links on the front page
      And I should see text matching "The Public SAML Signing certificate of the OpenConext IdP"
      And I should see URL "/authentication/idp/certificate"
+     # The default key should not get a separate URL next to the key-less url
      And I should not see URL "/authentication/idp/certificate/key:default"
      And I should see text matching "The Public SAML metadata \(the entity descriptor\) of the OpenConext IdP Proxy"
      And I should see URL "/authentication/idp/metadata"
@@ -28,14 +29,15 @@ Feature:
      And I should see URL "/authentication/sp/debug"
      And I should see text matching "The Public SAML Signing certificate of the OpenConext SP"
      And I should see URL "/authentication/sp/certificate"
-     And I should not see URL "/authentication/sp/certificate/key:default"
+     # The key:-variants should only be shown for the IdP metadata feeds
+     And I should not see URL "/authentication/sp/certificate/key:"
      And I should see text matching "The Public SAML metadata \(the entity descriptor\) of the OpenConext SP Proxy"
      And I should see URL "/authentication/sp/metadata"
-     And I should not see URL "/authentication/sp/metadata/key:default"
+     And I should not see URL "/authentication/sp/metadata/key:"
      And I should see text matching "Step-up authentication Certificate and Metadata"
      And I should see text matching "The Public SAML metadata \(the entity descriptor\) of the OpenConext step-up authentication Proxy"
      And I should see URL "/authentication/stepup/metadata"
-     And I should not see URL "/authentication/stepup/metadata/key:default"
+     And I should not see URL "/authentication/stepup/metadata/key:"
      # eduGAIN metadata is no longer created by EngineBlock
      And I should not see text matching "eduGAIN"
      # IdP / SP metadata combination (for Shiboleth entities) is no longer supported
diff --git a/theme/base/templates/modules/Authentication/View/Index/index.html.twig b/theme/base/templates/modules/Authentication/View/Index/index.html.twig
index bffed414df..6efc7c2221 100755
--- a/theme/base/templates/modules/Authentication/View/Index/index.html.twig
+++ b/theme/base/templates/modules/Authentication/View/Index/index.html.twig
@@ -93,9 +93,6 @@
                     <dd>
                         <ul>
                             <li><a href="/authentication/sp/certificate">Open link</a></li>
-                            {% for keyId in keyPairIds %}
-                                <li><a href="/authentication/sp/certificate/key:{{ keyId }}">Open link</a></li>
-                            {% endfor %}
                         </ul>
                     </dd>
                     <dt>
@@ -104,9 +101,6 @@
                     <dd>
                         <ul>
                             <li><a href="/authentication/sp/metadata">Open link</a></li>
-                            {% for keyId in keyPairIds %}
-                                <li><a href="/authentication/sp/metadata/key:{{ keyId }}">Open link</a></li>
-                            {% endfor %}
                         </ul>
                     </dd>
                 </dl>
@@ -122,9 +116,6 @@
                     <dd>
                         <ul>
                             <li><a href="/authentication/stepup/metadata">Open link</a></li>
-                            {% for keyId in keyPairIds %}
-                                <li><a href="/authentication/stepup/metadata/key:{{ keyId }}">Open link</a></li>
-                            {% endfor %}
                         </ul>
                     </dd>
                 </dl>
diff --git a/theme/openconext/templates/modules/Authentication/View/Index/index.html.twig b/theme/openconext/templates/modules/Authentication/View/Index/index.html.twig
index 9f417aba9b..2402dd204c 100644
--- a/theme/openconext/templates/modules/Authentication/View/Index/index.html.twig
+++ b/theme/openconext/templates/modules/Authentication/View/Index/index.html.twig
@@ -96,9 +96,6 @@
                     <dd>
                         <ul>
                             <li><a href="/authentication/sp/certificate">Open link</a></li>
-                            {% for keyId in keyPairIds %}
-                                <li><a href="/authentication/sp/certificate/key:{{ keyId }}">Open link</a></li>
-                            {% endfor %}
                         </ul>
                     </dd>
                     <dt>
@@ -107,9 +104,6 @@
                     <dd>
                         <ul>
                             <li><a href="/authentication/sp/metadata">Open link</a></li>
-                            {% for keyId in keyPairIds %}
-                                <li><a href="/authentication/sp/metadata/key:{{ keyId }}">Open link</a></li>
-                            {% endfor %}
                         </ul>
                     </dd>
                 </dl>
@@ -125,9 +119,6 @@
                     <dd>
                         <ul>
                             <li><a href="/authentication/stepup/metadata">Open link</a></li>
-                            {% for keyId in keyPairIds %}
-                                <li><a href="/authentication/stepup/metadata/key:{{ keyId }}">Open link</a></li>
-                            {% endfor %}
                         </ul>
                     </dd>
                 </dl>