diff --git a/eidas-test-connector/overlay/etc/eidas-connector/credentials/swedenconnect-signer.crt b/eidas-test-connector/overlay/etc/eidas-connector/credentials/swedenconnect-signer.crt
deleted file mode 100644
index 8466ecfe..00000000
--- a/eidas-test-connector/overlay/etc/eidas-connector/credentials/swedenconnect-signer.crt
+++ /dev/null
@@ -1,35 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGFTCCA/2gAwIBAgIJAMRMtpYesnyPMA0GCSqGSIb3DQEBCwUAMIGgMQswCQYD
-VQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0x
-IjAgBgNVBAoMGUUtTGVnaXRpbWF0aW9uc27Dg8KkbW5kZW4xFzAVBgNVBAsMDlN3
-ZWRlbiBDb25uZWN0MSwwKgYDVQQDDCNTd2VkZW4gQ29ubmVjdCBtZXRhZGF0YSBz
-aWduZXIgdjIuMDAeFw0xODA1MzAwOTIzMzVaFw0zODA1MzAwOTIzMzVaMIGgMQsw
-CQYDVQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hv
-bG0xIjAgBgNVBAoMGUUtTGVnaXRpbWF0aW9uc27Dg8KkbW5kZW4xFzAVBgNVBAsM
-DlN3ZWRlbiBDb25uZWN0MSwwKgYDVQQDDCNTd2VkZW4gQ29ubmVjdCBtZXRhZGF0
-YSBzaWduZXIgdjIuMDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPer
-La2IxQHWRFvX5mC8OgYSsZTjNcEGz0vLwBsdckQiBWWgrLdnU6+raS/SlriY4qcZ
-g8CJkhj8CdLBn6UxwdwOy+tGYjyAFCkV2yQ68euyNqwWgT6iiq/dn1kjWzamC18H
-U0LN/c7eieldhdI8edSF9Z6Drjt7s8glP4Lrd1FM5NXWros06fpEs61BoMZrIyei
-ptB4M7XBGJW6mQx3trnN4FnDZIyzNf9H+Z4XvXnn/URLMd0S3hS2uxVS7OGluKY6
-hhXfpcOGwUKcQmE7coI0mhZ9TAsG7h++J/A7aBp3eWr9eXzeFmwg7sHRBtd3LaD+
-yBLXuUFaPHJyOSFCeiys1O1Oh2CGpJIfPHlqmCQmTQrNEtioJyPRVAZamwio+mYt
-EsI8ssPW3/FNEe93cHd88BDhCDtz5oiQiGyflsCWSh4SwjFVVw7jgRGzmkn2TfHv
-yjiiexS8LeleqwMQ95e9dcVbktxBvDnPd0xCAXVL0y2P31DXLYe/2806C/21KWRU
-Z/EtLTQKpxJWhqsZwSZSpxjb6h3l8D9HAm5w4I/4w3JB40R7GJFWtuwh+clRnzC2
-xtN9cGfe+LXG0SG6ObUu9XBVBwNIL2xNgz+eSCv1n/8hlahoZySLtj0AKFQPyWvw
-Bitvvwk8uq3NPpBiz2nilHG3nnzlp+TK6+pjOHOrAgMBAAGjUDBOMB0GA1UdDgQW
-BBTqVEEVOf9SV47Nz0su8/MYAWOy4jAfBgNVHSMEGDAWgBTqVEEVOf9SV47Nz0su
-8/MYAWOy4jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQAXjshVZ5td
-ZqClqmZUEEWFh8oDk8lrRkZfXUmThQiKYq7NrLecbquDh1Mglq3zVxndZMAZVzrQ
-3U/EJ7B+LXfd5fnl91+qb5d1bJBs/Om/AyFA/bBnOyYPzkZWf+M8nItzQyOJX7ZO
-kzIOakaet6HR6T7ADk7vfSjqnRLywNL/cq3/if9c5WGh5NUSteltuDHOsm3DwvN4
-aFP+rngiYF1j509wbZOO7koIwZZUG9g0Etv0T8u7xXyZkYxjEfrr4uMf6121PoaP
-7mMU1Msuqw7idRMOj7mL5tIpu1ihw/a2pWqaXkxNsQXpOv+HtpBZ28pzqAtcHt8q
-r5V5Gm+W37RMlnIDsJwgEfA6FKEDqahSRmYnh8v+F9aDRDpGYpwRtK3k0tiy9Kvp
-8o16aCCqLtFU+Lme2NzkcFQubPmkan21M6/VTGP7UrgtvhXAaqYcTQBq/YJ4TiXz
-SBZgjywUi1nMZAzG4KS4jFR27Kdiul3G10I/M7nPtNq51uNspiO117zRo/8qD4wE
-BOoxiQw0f7/UPW8uznHU3DR3JUkTTlUfKHrfB7RZvkqw15bLkH8DpgINkjW+PFzI
-OkY6KYbZj/wwCYBw3rxMb4oY3Lv0S6cLmLvxmkG8eizY9ymwNlr/YAwPeyzuLPRf
-j6+cBKFT97et/lUMyfKVwbmuJNgtABRRcw==
------END CERTIFICATE-----
diff --git a/eidas-test-connector/overlay/etc/eidas-connector/credentials/test-metadata-signer.crt b/eidas-test-connector/overlay/etc/eidas-connector/credentials/test-metadata-signer.crt
new file mode 100644
index 00000000..fd32584f
--- /dev/null
+++ b/eidas-test-connector/overlay/etc/eidas-connector/credentials/test-metadata-signer.crt
@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFNDCCAxygAwIBAgIJAL6+XWRCiDY3MA0GCSqGSIb3DQEBBQUAMC8xDzANBgNV
+BAoMBlNDVEVTVDEcMBoGA1UEAwwTU3dlZGVuIENvbm5lY3QgdGVzdDAeFw0yMjAz
+MjkwODM3MDhaFw00MjAzMjkwODM3MDhaMC8xDzANBgNVBAoMBlNDVEVTVDEcMBoG
+A1UEAwwTU3dlZGVuIENvbm5lY3QgdGVzdDCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAKxgj9bio5mDrDYo8CuAtZKrZY9nWg6kFxqTVKXSEzghHT4EMoPf
+6gDktAAW5cdz5rRxlzZUdjzqPOF5nnE5l6VE41R/s/4RBp0Eq84WO+MM5+LVJfPd
+Mv0uKrss9GGPPbrqt01C0j3cSgpGkjGFyCNw+RS3C+SsjsqguB9AucYHnSL//jXV
+RhX6ol4/bwgYZTQ+3qIUfhN1ymntgi05Bc9kDGmW4Zli2JQkIjgpvFRDx79+05bO
+L9YMm6zdWVSVvg6RKPMEThuOOwc4tZe3omT6PQkUzJHRKvWFTSEEOJ715mZ/qRjr
+FU90k5DhNusLLngVjIHf8Is/J9ORPrbLFX5jEBMwVst8LW9CpGV5ezARH7LgNMgZ
+a3BNWPYRuLb6hmKldSWk3XQUWYVjIlkt3NolcFKzGYRjzdP5un4HOwXy1XU2razN
+GlHOpAR1fz/floB7zMBdaDNHS0oYilz/stjuFXXlBAACIIBaH8+xm/LYw4s5+PIj
+3fZ6QFY+kN/gpWcqx+o9yjP9TY18e/K+2VMFskrZfQZZh2Tfu/9Nauctfis5Yvo6
+Lv/iPAVS5EKgEyifMxRuU4Vlc72u+mSldwuo6s7l9pnjTYsN9RIbWfPjdF6TUz5U
+UDIbrJDUHcarRGG7q8wD2b5UOlPWLpEWRRFlXaM6T+/9ZQLTmLeZkK03AgMBAAGj
+UzBRMB0GA1UdDgQWBBRoLO88TwZaByh/BJ6rJaWbTn87SDAfBgNVHSMEGDAWgBRo
+LO88TwZaByh/BJ6rJaWbTn87SDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
+BQUAA4ICAQBfwvv/J2SwWaOLbVNxRmjHOiXjdgWNrqwjJ5olqCwW8L150SSxf32v
+BSyBycUShXtM8M4J5PkhHRm5hO5FJQF9A0In0lln4u1Yf8j4GAfk+Pwvu5oE9nal
+h75QpIGV2WqGkS5qYuVrferMb+nbbAcho8HCpOLikW+TCtxNzcTQJEexUK6npw2R
+2y3ua86bFolVp3TyRrYBWuTZIVwOwsOLdMNtncIw9n5kCuPbqKn8NcjbdQ1g0OAy
+PG4D9bPG9Ju98Xf+XiqRK/zlE4eYUV6tuiajsnfq3zaNarcR1IHFAsW326ZaIbpm
+Y5FL3qNY4uwxCiVRZB7PPeJN/XZfxaBYb7zZASN91Hsth9v3r4H9f2jGlZLbvPAh
+RL8cyx3a+LH8GQyh/OnhueuB5ovp74p7EugHu0uDtCCMKMjMpsYjVSzl5ummqNew
+3fyKR0Nmr8DWX4dlpohuenDv4umKsSJODt1huW5gcwQp8Y719NLqNZuIjnr9qZtE
+/qm6mWeDfp76+LemSdFfX2Nkb8+ZNHdUXUqPynkH1BCocmB91VObKTP4enQyp/+U
+sdIQt6anGSU/LC7FsggbzSo6xdhuYxhh70+xAzGe2FFQHtYHOX6u38Agw+IB2462
+W3H4unQMgNcLSYEAjclVYqNmV82EaX2R1TuF5oVyI9PSunNxHTyBQQ==
+-----END CERTIFICATE-----
diff --git a/eidas-test-connector/overlay/etc/eidas-connector/eidas-connector.conf b/eidas-test-connector/overlay/etc/eidas-connector/eidas-connector.conf
index 67ad4e59..ac95efdb 100644
--- a/eidas-test-connector/overlay/etc/eidas-connector/eidas-connector.conf
+++ b/eidas-test-connector/overlay/etc/eidas-connector/eidas-connector.conf
@@ -58,7 +58,7 @@ export IDP_ENCRYPTION_CERT=$IDP_CREDENTIALS/enc.crt
 
 export IDP_METADATA_SIGNING_PKCS11_ALIAS=swedenconnect
 export IDP_METADATA_SIGNING_PKCS11_CFG="/etc/eidas-connector/credentials/pkcs11.cfg"
-export IDP_METADATA_SIGNING_CERT=$IDP_CREDENTIALS/swedenconnect-signer.crt
+export IDP_METADATA_SIGNING_CERT=$IDP_CREDENTIALS/test-metadata-signer.crt
 
 export SP_CREDENTIALS=/etc/eidas-connector/credentials
 
@@ -72,7 +72,7 @@ export SP_ENCRYPTION_CERT=$SP_CREDENTIALS/enc.crt
 
 export SP_METADATA_SIGNING_PKCS11_ALIAS=swedenconnect
 export SP_METADATA_SIGNING_PKCS11_CFG="/etc/eidas-connector/credentials/pkcs11.cfg"
-export SP_METADATA_SIGNING_CERT=$SP_CREDENTIALS/swedenconnect-signer.crt
+export SP_METADATA_SIGNING_CERT=$SP_CREDENTIALS/test-metadata-signer.crt
 
 # Tomcat settings
 export TOMCAT_CREDENTIALS=/etc/eidas-connector/credentials/tomcat
@@ -81,12 +81,12 @@ export TOMCAT_TLS_SERVER_CERTIFICATE=$TOMCAT_CREDENTIALS/tomcat-cert.pem
 export TOMCAT_TLS_SERVER_CERTIFICATE_CHAIN=$TOMCAT_CREDENTIALS/tomcat-chain.pem
 
 export FEDERATION_METADATA_URL=https://test.md.swedenconnect.se/entities
-export FEDERATION_METADATA_VALIDATION_CERT=/etc/eidas-connector/credentials/swedenconnect-signer.crt
+export FEDERATION_METADATA_VALIDATION_CERT=/etc/eidas-connector/credentials/test-metadata-signer.crt
 
 unset EIDAS_METADATA_SERVICE_LIST_URL=https://test.md.eidas.swedenconnect.se/mdservicelist-aggregate.xml
-unset EIDAS_METADATA_SERVICE_LIST_VALIDATION_CERT=/etc/eidas-connector/credentials/swedenconnect-signer.crt
+unset EIDAS_METADATA_SERVICE_LIST_VALIDATION_CERT=/etc/eidas-connector/credentials/test-metadata-signer.crt
 
 EIDAS_METADATA_URL=https://test.md.eidas.swedenconnect.se/role/idp.xml
-EIDAS_METADATA_VALIDATION_CERT=/etc/eidas-connector/credentials/swedenconnect-signer.crt
+EIDAS_METADATA_VALIDATION_CERT=/etc/eidas-connector/credentials/test-metadata-signer.crt
 
 export IDP_ACCESSIBILITY_URL=https://www.swedenconnect.se/om/om-webbplatsen/tillganglighet/svenska-eidas-noden
diff --git a/eidas-test-proxy/overlay/etc/eidas-proxy/se/cfg/application-se.properties b/eidas-test-proxy/overlay/etc/eidas-proxy/se/cfg/application-se.properties
index 9ad2a961..13d4dcfb 100644
--- a/eidas-test-proxy/overlay/etc/eidas-proxy/se/cfg/application-se.properties
+++ b/eidas-test-proxy/overlay/etc/eidas-proxy/se/cfg/application-se.properties
@@ -71,14 +71,14 @@ proxy-service.eidasMdListLocation=https://test.md.eidas.swedenconnect.se/mdservi
 
 # Optional certificate file for validating metadata service list file signatures
 # If no certificate is specified then proxy-service.dev.ignoreMetadataSignCheck=true must be set
-proxy-service.eidasMdListCertFile=${proxy-service.path.prefix}/cfg/metadata.crt
+proxy-service.eidasMdListCertFile=${proxy-service.path.prefix}/cfg/test-metadata-signer.crt
 
 #Metadata location for aggregated metadata specified as either URL (http or https), "file://" or "classpath:"
 proxy-service.eidasMetadataLocation=https://test.md.eidas.swedenconnect.se/role/sp.xml
 
 # Optional certificate file for validating metadata signatures
 # If no certificate is specified then proxy-service.dev.ignoreMetadataSignCheck=true must be set
-proxy-service.eidasMetadataCertFile=${proxy-service.path.prefix}/cfg/metadata.crt
+proxy-service.eidasMetadataCertFile=${proxy-service.path.prefix}/cfg/test-metadata-signer.crt
 
 # Optional cache dir for caching downloaded metadata. If not set, cache is stored in memory.
 proxy-service.eidasMetadataCacheDirName=${proxy-service.path.prefix}/ps-mdcache
@@ -91,7 +91,7 @@ proxy-service.eidasMetadataCacheDirName=${proxy-service.path.prefix}/ps-mdcache
 #proxy-service.nationalMetadata.test.index=1
 
 proxy-service.nationalMetadata.test.location=https://test.md.swedenconnect.se/role/idp.xml
-proxy-service.nationalMetadata.test.certFile=${proxy-service.path.prefix}/cfg/metadata.crt
+proxy-service.nationalMetadata.test.certFile=${proxy-service.path.prefix}/cfg/test-metadata-signer.crt
 proxy-service.nationalMetadata.test.cacheFile=${proxy-service.path.prefix}/cache/test-metadata.xml
 proxy-service.nationalMetadata.test.index=0
 
diff --git a/eidas-test-proxy/overlay/etc/eidas-proxy/se/cfg/swedenconnect-signer.crt b/eidas-test-proxy/overlay/etc/eidas-proxy/se/cfg/swedenconnect-signer.crt
deleted file mode 100644
index 8466ecfe..00000000
--- a/eidas-test-proxy/overlay/etc/eidas-proxy/se/cfg/swedenconnect-signer.crt
+++ /dev/null
@@ -1,35 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGFTCCA/2gAwIBAgIJAMRMtpYesnyPMA0GCSqGSIb3DQEBCwUAMIGgMQswCQYD
-VQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0x
-IjAgBgNVBAoMGUUtTGVnaXRpbWF0aW9uc27Dg8KkbW5kZW4xFzAVBgNVBAsMDlN3
-ZWRlbiBDb25uZWN0MSwwKgYDVQQDDCNTd2VkZW4gQ29ubmVjdCBtZXRhZGF0YSBz
-aWduZXIgdjIuMDAeFw0xODA1MzAwOTIzMzVaFw0zODA1MzAwOTIzMzVaMIGgMQsw
-CQYDVQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hv
-bG0xIjAgBgNVBAoMGUUtTGVnaXRpbWF0aW9uc27Dg8KkbW5kZW4xFzAVBgNVBAsM
-DlN3ZWRlbiBDb25uZWN0MSwwKgYDVQQDDCNTd2VkZW4gQ29ubmVjdCBtZXRhZGF0
-YSBzaWduZXIgdjIuMDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPer
-La2IxQHWRFvX5mC8OgYSsZTjNcEGz0vLwBsdckQiBWWgrLdnU6+raS/SlriY4qcZ
-g8CJkhj8CdLBn6UxwdwOy+tGYjyAFCkV2yQ68euyNqwWgT6iiq/dn1kjWzamC18H
-U0LN/c7eieldhdI8edSF9Z6Drjt7s8glP4Lrd1FM5NXWros06fpEs61BoMZrIyei
-ptB4M7XBGJW6mQx3trnN4FnDZIyzNf9H+Z4XvXnn/URLMd0S3hS2uxVS7OGluKY6
-hhXfpcOGwUKcQmE7coI0mhZ9TAsG7h++J/A7aBp3eWr9eXzeFmwg7sHRBtd3LaD+
-yBLXuUFaPHJyOSFCeiys1O1Oh2CGpJIfPHlqmCQmTQrNEtioJyPRVAZamwio+mYt
-EsI8ssPW3/FNEe93cHd88BDhCDtz5oiQiGyflsCWSh4SwjFVVw7jgRGzmkn2TfHv
-yjiiexS8LeleqwMQ95e9dcVbktxBvDnPd0xCAXVL0y2P31DXLYe/2806C/21KWRU
-Z/EtLTQKpxJWhqsZwSZSpxjb6h3l8D9HAm5w4I/4w3JB40R7GJFWtuwh+clRnzC2
-xtN9cGfe+LXG0SG6ObUu9XBVBwNIL2xNgz+eSCv1n/8hlahoZySLtj0AKFQPyWvw
-Bitvvwk8uq3NPpBiz2nilHG3nnzlp+TK6+pjOHOrAgMBAAGjUDBOMB0GA1UdDgQW
-BBTqVEEVOf9SV47Nz0su8/MYAWOy4jAfBgNVHSMEGDAWgBTqVEEVOf9SV47Nz0su
-8/MYAWOy4jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQAXjshVZ5td
-ZqClqmZUEEWFh8oDk8lrRkZfXUmThQiKYq7NrLecbquDh1Mglq3zVxndZMAZVzrQ
-3U/EJ7B+LXfd5fnl91+qb5d1bJBs/Om/AyFA/bBnOyYPzkZWf+M8nItzQyOJX7ZO
-kzIOakaet6HR6T7ADk7vfSjqnRLywNL/cq3/if9c5WGh5NUSteltuDHOsm3DwvN4
-aFP+rngiYF1j509wbZOO7koIwZZUG9g0Etv0T8u7xXyZkYxjEfrr4uMf6121PoaP
-7mMU1Msuqw7idRMOj7mL5tIpu1ihw/a2pWqaXkxNsQXpOv+HtpBZ28pzqAtcHt8q
-r5V5Gm+W37RMlnIDsJwgEfA6FKEDqahSRmYnh8v+F9aDRDpGYpwRtK3k0tiy9Kvp
-8o16aCCqLtFU+Lme2NzkcFQubPmkan21M6/VTGP7UrgtvhXAaqYcTQBq/YJ4TiXz
-SBZgjywUi1nMZAzG4KS4jFR27Kdiul3G10I/M7nPtNq51uNspiO117zRo/8qD4wE
-BOoxiQw0f7/UPW8uznHU3DR3JUkTTlUfKHrfB7RZvkqw15bLkH8DpgINkjW+PFzI
-OkY6KYbZj/wwCYBw3rxMb4oY3Lv0S6cLmLvxmkG8eizY9ymwNlr/YAwPeyzuLPRf
-j6+cBKFT97et/lUMyfKVwbmuJNgtABRRcw==
------END CERTIFICATE-----
diff --git a/eidas-test-proxy/overlay/etc/eidas-proxy/se/cfg/test-metadata-signer.crt b/eidas-test-proxy/overlay/etc/eidas-proxy/se/cfg/test-metadata-signer.crt
new file mode 100644
index 00000000..fd32584f
--- /dev/null
+++ b/eidas-test-proxy/overlay/etc/eidas-proxy/se/cfg/test-metadata-signer.crt
@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFNDCCAxygAwIBAgIJAL6+XWRCiDY3MA0GCSqGSIb3DQEBBQUAMC8xDzANBgNV
+BAoMBlNDVEVTVDEcMBoGA1UEAwwTU3dlZGVuIENvbm5lY3QgdGVzdDAeFw0yMjAz
+MjkwODM3MDhaFw00MjAzMjkwODM3MDhaMC8xDzANBgNVBAoMBlNDVEVTVDEcMBoG
+A1UEAwwTU3dlZGVuIENvbm5lY3QgdGVzdDCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAKxgj9bio5mDrDYo8CuAtZKrZY9nWg6kFxqTVKXSEzghHT4EMoPf
+6gDktAAW5cdz5rRxlzZUdjzqPOF5nnE5l6VE41R/s/4RBp0Eq84WO+MM5+LVJfPd
+Mv0uKrss9GGPPbrqt01C0j3cSgpGkjGFyCNw+RS3C+SsjsqguB9AucYHnSL//jXV
+RhX6ol4/bwgYZTQ+3qIUfhN1ymntgi05Bc9kDGmW4Zli2JQkIjgpvFRDx79+05bO
+L9YMm6zdWVSVvg6RKPMEThuOOwc4tZe3omT6PQkUzJHRKvWFTSEEOJ715mZ/qRjr
+FU90k5DhNusLLngVjIHf8Is/J9ORPrbLFX5jEBMwVst8LW9CpGV5ezARH7LgNMgZ
+a3BNWPYRuLb6hmKldSWk3XQUWYVjIlkt3NolcFKzGYRjzdP5un4HOwXy1XU2razN
+GlHOpAR1fz/floB7zMBdaDNHS0oYilz/stjuFXXlBAACIIBaH8+xm/LYw4s5+PIj
+3fZ6QFY+kN/gpWcqx+o9yjP9TY18e/K+2VMFskrZfQZZh2Tfu/9Nauctfis5Yvo6
+Lv/iPAVS5EKgEyifMxRuU4Vlc72u+mSldwuo6s7l9pnjTYsN9RIbWfPjdF6TUz5U
+UDIbrJDUHcarRGG7q8wD2b5UOlPWLpEWRRFlXaM6T+/9ZQLTmLeZkK03AgMBAAGj
+UzBRMB0GA1UdDgQWBBRoLO88TwZaByh/BJ6rJaWbTn87SDAfBgNVHSMEGDAWgBRo
+LO88TwZaByh/BJ6rJaWbTn87SDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
+BQUAA4ICAQBfwvv/J2SwWaOLbVNxRmjHOiXjdgWNrqwjJ5olqCwW8L150SSxf32v
+BSyBycUShXtM8M4J5PkhHRm5hO5FJQF9A0In0lln4u1Yf8j4GAfk+Pwvu5oE9nal
+h75QpIGV2WqGkS5qYuVrferMb+nbbAcho8HCpOLikW+TCtxNzcTQJEexUK6npw2R
+2y3ua86bFolVp3TyRrYBWuTZIVwOwsOLdMNtncIw9n5kCuPbqKn8NcjbdQ1g0OAy
+PG4D9bPG9Ju98Xf+XiqRK/zlE4eYUV6tuiajsnfq3zaNarcR1IHFAsW326ZaIbpm
+Y5FL3qNY4uwxCiVRZB7PPeJN/XZfxaBYb7zZASN91Hsth9v3r4H9f2jGlZLbvPAh
+RL8cyx3a+LH8GQyh/OnhueuB5ovp74p7EugHu0uDtCCMKMjMpsYjVSzl5ummqNew
+3fyKR0Nmr8DWX4dlpohuenDv4umKsSJODt1huW5gcwQp8Y719NLqNZuIjnr9qZtE
+/qm6mWeDfp76+LemSdFfX2Nkb8+ZNHdUXUqPynkH1BCocmB91VObKTP4enQyp/+U
+sdIQt6anGSU/LC7FsggbzSo6xdhuYxhh70+xAzGe2FFQHtYHOX6u38Agw+IB2462
+W3H4unQMgNcLSYEAjclVYqNmV82EaX2R1TuF5oVyI9PSunNxHTyBQQ==
+-----END CERTIFICATE-----
diff --git a/eumd-test-common/overlay/etc/credentials/swedenconnect-signer.crt b/eumd-test-common/overlay/etc/credentials/swedenconnect-signer.crt
deleted file mode 100644
index 8466ecfe..00000000
--- a/eumd-test-common/overlay/etc/credentials/swedenconnect-signer.crt
+++ /dev/null
@@ -1,35 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGFTCCA/2gAwIBAgIJAMRMtpYesnyPMA0GCSqGSIb3DQEBCwUAMIGgMQswCQYD
-VQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0x
-IjAgBgNVBAoMGUUtTGVnaXRpbWF0aW9uc27Dg8KkbW5kZW4xFzAVBgNVBAsMDlN3
-ZWRlbiBDb25uZWN0MSwwKgYDVQQDDCNTd2VkZW4gQ29ubmVjdCBtZXRhZGF0YSBz
-aWduZXIgdjIuMDAeFw0xODA1MzAwOTIzMzVaFw0zODA1MzAwOTIzMzVaMIGgMQsw
-CQYDVQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hv
-bG0xIjAgBgNVBAoMGUUtTGVnaXRpbWF0aW9uc27Dg8KkbW5kZW4xFzAVBgNVBAsM
-DlN3ZWRlbiBDb25uZWN0MSwwKgYDVQQDDCNTd2VkZW4gQ29ubmVjdCBtZXRhZGF0
-YSBzaWduZXIgdjIuMDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPer
-La2IxQHWRFvX5mC8OgYSsZTjNcEGz0vLwBsdckQiBWWgrLdnU6+raS/SlriY4qcZ
-g8CJkhj8CdLBn6UxwdwOy+tGYjyAFCkV2yQ68euyNqwWgT6iiq/dn1kjWzamC18H
-U0LN/c7eieldhdI8edSF9Z6Drjt7s8glP4Lrd1FM5NXWros06fpEs61BoMZrIyei
-ptB4M7XBGJW6mQx3trnN4FnDZIyzNf9H+Z4XvXnn/URLMd0S3hS2uxVS7OGluKY6
-hhXfpcOGwUKcQmE7coI0mhZ9TAsG7h++J/A7aBp3eWr9eXzeFmwg7sHRBtd3LaD+
-yBLXuUFaPHJyOSFCeiys1O1Oh2CGpJIfPHlqmCQmTQrNEtioJyPRVAZamwio+mYt
-EsI8ssPW3/FNEe93cHd88BDhCDtz5oiQiGyflsCWSh4SwjFVVw7jgRGzmkn2TfHv
-yjiiexS8LeleqwMQ95e9dcVbktxBvDnPd0xCAXVL0y2P31DXLYe/2806C/21KWRU
-Z/EtLTQKpxJWhqsZwSZSpxjb6h3l8D9HAm5w4I/4w3JB40R7GJFWtuwh+clRnzC2
-xtN9cGfe+LXG0SG6ObUu9XBVBwNIL2xNgz+eSCv1n/8hlahoZySLtj0AKFQPyWvw
-Bitvvwk8uq3NPpBiz2nilHG3nnzlp+TK6+pjOHOrAgMBAAGjUDBOMB0GA1UdDgQW
-BBTqVEEVOf9SV47Nz0su8/MYAWOy4jAfBgNVHSMEGDAWgBTqVEEVOf9SV47Nz0su
-8/MYAWOy4jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQAXjshVZ5td
-ZqClqmZUEEWFh8oDk8lrRkZfXUmThQiKYq7NrLecbquDh1Mglq3zVxndZMAZVzrQ
-3U/EJ7B+LXfd5fnl91+qb5d1bJBs/Om/AyFA/bBnOyYPzkZWf+M8nItzQyOJX7ZO
-kzIOakaet6HR6T7ADk7vfSjqnRLywNL/cq3/if9c5WGh5NUSteltuDHOsm3DwvN4
-aFP+rngiYF1j509wbZOO7koIwZZUG9g0Etv0T8u7xXyZkYxjEfrr4uMf6121PoaP
-7mMU1Msuqw7idRMOj7mL5tIpu1ihw/a2pWqaXkxNsQXpOv+HtpBZ28pzqAtcHt8q
-r5V5Gm+W37RMlnIDsJwgEfA6FKEDqahSRmYnh8v+F9aDRDpGYpwRtK3k0tiy9Kvp
-8o16aCCqLtFU+Lme2NzkcFQubPmkan21M6/VTGP7UrgtvhXAaqYcTQBq/YJ4TiXz
-SBZgjywUi1nMZAzG4KS4jFR27Kdiul3G10I/M7nPtNq51uNspiO117zRo/8qD4wE
-BOoxiQw0f7/UPW8uznHU3DR3JUkTTlUfKHrfB7RZvkqw15bLkH8DpgINkjW+PFzI
-OkY6KYbZj/wwCYBw3rxMb4oY3Lv0S6cLmLvxmkG8eizY9ymwNlr/YAwPeyzuLPRf
-j6+cBKFT97et/lUMyfKVwbmuJNgtABRRcw==
------END CERTIFICATE-----
diff --git a/eumd-test-common/overlay/etc/credentials/test-metadata-signer.crt b/eumd-test-common/overlay/etc/credentials/test-metadata-signer.crt
new file mode 100644
index 00000000..fd32584f
--- /dev/null
+++ b/eumd-test-common/overlay/etc/credentials/test-metadata-signer.crt
@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFNDCCAxygAwIBAgIJAL6+XWRCiDY3MA0GCSqGSIb3DQEBBQUAMC8xDzANBgNV
+BAoMBlNDVEVTVDEcMBoGA1UEAwwTU3dlZGVuIENvbm5lY3QgdGVzdDAeFw0yMjAz
+MjkwODM3MDhaFw00MjAzMjkwODM3MDhaMC8xDzANBgNVBAoMBlNDVEVTVDEcMBoG
+A1UEAwwTU3dlZGVuIENvbm5lY3QgdGVzdDCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAKxgj9bio5mDrDYo8CuAtZKrZY9nWg6kFxqTVKXSEzghHT4EMoPf
+6gDktAAW5cdz5rRxlzZUdjzqPOF5nnE5l6VE41R/s/4RBp0Eq84WO+MM5+LVJfPd
+Mv0uKrss9GGPPbrqt01C0j3cSgpGkjGFyCNw+RS3C+SsjsqguB9AucYHnSL//jXV
+RhX6ol4/bwgYZTQ+3qIUfhN1ymntgi05Bc9kDGmW4Zli2JQkIjgpvFRDx79+05bO
+L9YMm6zdWVSVvg6RKPMEThuOOwc4tZe3omT6PQkUzJHRKvWFTSEEOJ715mZ/qRjr
+FU90k5DhNusLLngVjIHf8Is/J9ORPrbLFX5jEBMwVst8LW9CpGV5ezARH7LgNMgZ
+a3BNWPYRuLb6hmKldSWk3XQUWYVjIlkt3NolcFKzGYRjzdP5un4HOwXy1XU2razN
+GlHOpAR1fz/floB7zMBdaDNHS0oYilz/stjuFXXlBAACIIBaH8+xm/LYw4s5+PIj
+3fZ6QFY+kN/gpWcqx+o9yjP9TY18e/K+2VMFskrZfQZZh2Tfu/9Nauctfis5Yvo6
+Lv/iPAVS5EKgEyifMxRuU4Vlc72u+mSldwuo6s7l9pnjTYsN9RIbWfPjdF6TUz5U
+UDIbrJDUHcarRGG7q8wD2b5UOlPWLpEWRRFlXaM6T+/9ZQLTmLeZkK03AgMBAAGj
+UzBRMB0GA1UdDgQWBBRoLO88TwZaByh/BJ6rJaWbTn87SDAfBgNVHSMEGDAWgBRo
+LO88TwZaByh/BJ6rJaWbTn87SDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
+BQUAA4ICAQBfwvv/J2SwWaOLbVNxRmjHOiXjdgWNrqwjJ5olqCwW8L150SSxf32v
+BSyBycUShXtM8M4J5PkhHRm5hO5FJQF9A0In0lln4u1Yf8j4GAfk+Pwvu5oE9nal
+h75QpIGV2WqGkS5qYuVrferMb+nbbAcho8HCpOLikW+TCtxNzcTQJEexUK6npw2R
+2y3ua86bFolVp3TyRrYBWuTZIVwOwsOLdMNtncIw9n5kCuPbqKn8NcjbdQ1g0OAy
+PG4D9bPG9Ju98Xf+XiqRK/zlE4eYUV6tuiajsnfq3zaNarcR1IHFAsW326ZaIbpm
+Y5FL3qNY4uwxCiVRZB7PPeJN/XZfxaBYb7zZASN91Hsth9v3r4H9f2jGlZLbvPAh
+RL8cyx3a+LH8GQyh/OnhueuB5ovp74p7EugHu0uDtCCMKMjMpsYjVSzl5ummqNew
+3fyKR0Nmr8DWX4dlpohuenDv4umKsSJODt1huW5gcwQp8Y719NLqNZuIjnr9qZtE
+/qm6mWeDfp76+LemSdFfX2Nkb8+ZNHdUXUqPynkH1BCocmB91VObKTP4enQyp/+U
+sdIQt6anGSU/LC7FsggbzSo6xdhuYxhh70+xAzGe2FFQHtYHOX6u38Agw+IB2462
+W3H4unQMgNcLSYEAjclVYqNmV82EaX2R1TuF5oVyI9PSunNxHTyBQQ==
+-----END CERTIFICATE-----
diff --git a/eumd-test-common/overlay/etc/mirror-mdq/post.d/20-mdservicelist.sh b/eumd-test-common/overlay/etc/mirror-mdq/post.d/20-mdservicelist.sh
index 8061b8ab..f794de9f 100755
--- a/eumd-test-common/overlay/etc/mirror-mdq/post.d/20-mdservicelist.sh
+++ b/eumd-test-common/overlay/etc/mirror-mdq/post.d/20-mdservicelist.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 KEY=http://eidas_hsm_client_hsmproxy.docker:8000/sc_ha/sctest
-CERT=/etc/credentials/swedenconnect-signer.crt
+CERT=/etc/credentials/test-metadata-signer.crt
 CONTAINER=pyff-eidas-test
 
 /opt/metadata/scripts/mk_mdsl.sh /opt/metadata/eidas-test.xml $KEY $CERT $CONTAINER > mdservicelist-aggregate.xml
diff --git a/eumd-test-common/overlay/etc/mirror-mdq/template/index.html b/eumd-test-common/overlay/etc/mirror-mdq/template/index.html
index d16f5d34..6eedf162 100644
--- a/eumd-test-common/overlay/etc/mirror-mdq/template/index.html
+++ b/eumd-test-common/overlay/etc/mirror-mdq/template/index.html
@@ -43,34 +43,34 @@
          <h2>Signeringscertifikat</h2>
          <div class="code"><pre>
 -----BEGIN CERTIFICATE-----
-MIIFIjCCAwoCCQCVO3v9xSA+FDANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJT
-RTEnMCUGA1UECgweU3dlZGlzaCBFLWlkZW50aWZpY2F0aW9uIEJvYXJkMRswGQYD
-VQQDDBJRQSBNZXRhZGF0YSBTaWduZXIwHhcNMTcxMjE5MTIyMDI1WhcNMjcxMjE3
-MTIyMDI1WjBTMQswCQYDVQQGEwJTRTEnMCUGA1UECgweU3dlZGlzaCBFLWlkZW50
-aWZpY2F0aW9uIEJvYXJkMRswGQYDVQQDDBJRQSBNZXRhZGF0YSBTaWduZXIwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDYzcmlNTMkBzIYUXxT13zNMakh
-xR9BO1Qnlt2euUNdvL8FhgiNo+2AJDxFWts8nsg9Jam15F38nTqRMt4r1zFHYFJ5
-22h8urckpwvFVu/kjQrY8pztLE/pPvGXLPlySDkiRifCGibXuACngZx5chCwNs2h
-2OoMgKH7d5aZmUcB2mIc/Ybd98W9jtch1gh5/QM0aJsYnDTYuB840YGwHXCyiBUf
-1teUT9bJ/Y90OSXBdib9kuOmtQNMTYtyX8FAodYXVx8ibXNDfhdGaBJh+2J4lFTA
-DQQ1tM1YigZyvBuslBcuLDfZce0OaWPYPAf8PE8voxJhGkA026GGNjXP/9nRK146
-bkN4nd/Aa6842aYEOjjcDAl43tjHKZBu0+pnq/2GRiN7Dw4Y+Td/2y8PqD/W87CV
-ttrU6yniSMr7Y1+TfzzESSVPXs+csyatH9MJ2IA184Oh7TL6tPh5N96ugh7s85pN
-zswG+Gouw1BVCfqpSJmmNMheEOr6igOYQ0LY5aOooLoqET9gu0ks9cixjANFhnhE
-vRVkMfbnFVAnvXQEWPQY5NgqO4b0Z65ey011L+slNo6EIiw0FkznAwER0aYzrM2r
-hs/hJAAbjnxEhgMKN9bdoXpnrAehwbTOTipOWwrdcd3IKNdDEyFY15j5rGgyIBcK
-8gNnvGJLKcaC4vBd1QIDAQABMA0GCSqGSIb3DQEBCwUAA4ICAQBuws48HrfwW/Eq
-WN4+VSZ1cMgkp/mgqyyDdXoCPUf5o7ro17oDSocmpdQypiCr6M88MACBX8cqKmie
-kIyptrzp1x2seo8rTJpno97dt3hSwbe6+SbRh2bjDpDzL2ecrtv/GXjR41b2CbMO
-wu4WTgiFhWmKGNDNcEem37VUpKEYe7u/ucie71AQi49jM0rJ5uSVdBONKj3iAH5d
-mckw2nt6HKMJ0S+ckM/aq+m8ACgAyYmMr74Yt6wcpl/NORtIxaGUeT7Z8rN7TUmk
-gP9scbYF16xJJkxtylnK2BrSwSFOIuB5KJo2xxhuMffxEgdy4711TfwMCUaTPKmF
-dlYzPKeBaYzWFU42jcVsiQz4mSqgvS2dS8nZpYe2K0zHIzKwytn+HQ36KhRRDAVR
-7aKH9S8FZJXC6wqXFdEwwZujkGhu/BxgfjGkde8qOQMUwHboX9+aflQ9okB1Tha6
-xVB1kG86WdgJLmrsfqaX1FVyO761ZXYHTuoAZ0iuzIRhteUksfRZchnKpUX0fF1i
-yB9M0E6JfqvFeVfLlo8c2FI4MUYFWgqciizaXSfw0waMFdX5+U33eXr1RWF0POZX
-JERf83JkjVLanESP9/U9nsZYgIiSX88PahYtuSZLhqamzzFvK+wuVcNKark8s1kS
-2d8EIOY6h4jmS2ds9ORaavkV/xxTAA==
+MIIFNDCCAxygAwIBAgIJAL6+XWRCiDY3MA0GCSqGSIb3DQEBBQUAMC8xDzANBgNV
+BAoMBlNDVEVTVDEcMBoGA1UEAwwTU3dlZGVuIENvbm5lY3QgdGVzdDAeFw0yMjAz
+MjkwODM3MDhaFw00MjAzMjkwODM3MDhaMC8xDzANBgNVBAoMBlNDVEVTVDEcMBoG
+A1UEAwwTU3dlZGVuIENvbm5lY3QgdGVzdDCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAKxgj9bio5mDrDYo8CuAtZKrZY9nWg6kFxqTVKXSEzghHT4EMoPf
+6gDktAAW5cdz5rRxlzZUdjzqPOF5nnE5l6VE41R/s/4RBp0Eq84WO+MM5+LVJfPd
+Mv0uKrss9GGPPbrqt01C0j3cSgpGkjGFyCNw+RS3C+SsjsqguB9AucYHnSL//jXV
+RhX6ol4/bwgYZTQ+3qIUfhN1ymntgi05Bc9kDGmW4Zli2JQkIjgpvFRDx79+05bO
+L9YMm6zdWVSVvg6RKPMEThuOOwc4tZe3omT6PQkUzJHRKvWFTSEEOJ715mZ/qRjr
+FU90k5DhNusLLngVjIHf8Is/J9ORPrbLFX5jEBMwVst8LW9CpGV5ezARH7LgNMgZ
+a3BNWPYRuLb6hmKldSWk3XQUWYVjIlkt3NolcFKzGYRjzdP5un4HOwXy1XU2razN
+GlHOpAR1fz/floB7zMBdaDNHS0oYilz/stjuFXXlBAACIIBaH8+xm/LYw4s5+PIj
+3fZ6QFY+kN/gpWcqx+o9yjP9TY18e/K+2VMFskrZfQZZh2Tfu/9Nauctfis5Yvo6
+Lv/iPAVS5EKgEyifMxRuU4Vlc72u+mSldwuo6s7l9pnjTYsN9RIbWfPjdF6TUz5U
+UDIbrJDUHcarRGG7q8wD2b5UOlPWLpEWRRFlXaM6T+/9ZQLTmLeZkK03AgMBAAGj
+UzBRMB0GA1UdDgQWBBRoLO88TwZaByh/BJ6rJaWbTn87SDAfBgNVHSMEGDAWgBRo
+LO88TwZaByh/BJ6rJaWbTn87SDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
+BQUAA4ICAQBfwvv/J2SwWaOLbVNxRmjHOiXjdgWNrqwjJ5olqCwW8L150SSxf32v
+BSyBycUShXtM8M4J5PkhHRm5hO5FJQF9A0In0lln4u1Yf8j4GAfk+Pwvu5oE9nal
+h75QpIGV2WqGkS5qYuVrferMb+nbbAcho8HCpOLikW+TCtxNzcTQJEexUK6npw2R
+2y3ua86bFolVp3TyRrYBWuTZIVwOwsOLdMNtncIw9n5kCuPbqKn8NcjbdQ1g0OAy
+PG4D9bPG9Ju98Xf+XiqRK/zlE4eYUV6tuiajsnfq3zaNarcR1IHFAsW326ZaIbpm
+Y5FL3qNY4uwxCiVRZB7PPeJN/XZfxaBYb7zZASN91Hsth9v3r4H9f2jGlZLbvPAh
+RL8cyx3a+LH8GQyh/OnhueuB5ovp74p7EugHu0uDtCCMKMjMpsYjVSzl5ummqNew
+3fyKR0Nmr8DWX4dlpohuenDv4umKsSJODt1huW5gcwQp8Y719NLqNZuIjnr9qZtE
+/qm6mWeDfp76+LemSdFfX2Nkb8+ZNHdUXUqPynkH1BCocmB91VObKTP4enQyp/+U
+sdIQt6anGSU/LC7FsggbzSo6xdhuYxhh70+xAzGe2FFQHtYHOX6u38Agw+IB2462
+W3H4unQMgNcLSYEAjclVYqNmV82EaX2R1TuF5oVyI9PSunNxHTyBQQ==
 -----END CERTIFICATE-----
        </pre></div>
         </div> 
diff --git a/natmd-test-common/overlay/etc/credentials/swedenconnect-signer.crt b/natmd-test-common/overlay/etc/credentials/swedenconnect-signer.crt
deleted file mode 100644
index 8466ecfe..00000000
--- a/natmd-test-common/overlay/etc/credentials/swedenconnect-signer.crt
+++ /dev/null
@@ -1,35 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIGFTCCA/2gAwIBAgIJAMRMtpYesnyPMA0GCSqGSIb3DQEBCwUAMIGgMQswCQYD
-VQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0x
-IjAgBgNVBAoMGUUtTGVnaXRpbWF0aW9uc27Dg8KkbW5kZW4xFzAVBgNVBAsMDlN3
-ZWRlbiBDb25uZWN0MSwwKgYDVQQDDCNTd2VkZW4gQ29ubmVjdCBtZXRhZGF0YSBz
-aWduZXIgdjIuMDAeFw0xODA1MzAwOTIzMzVaFw0zODA1MzAwOTIzMzVaMIGgMQsw
-CQYDVQQGEwJTRTESMBAGA1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hv
-bG0xIjAgBgNVBAoMGUUtTGVnaXRpbWF0aW9uc27Dg8KkbW5kZW4xFzAVBgNVBAsM
-DlN3ZWRlbiBDb25uZWN0MSwwKgYDVQQDDCNTd2VkZW4gQ29ubmVjdCBtZXRhZGF0
-YSBzaWduZXIgdjIuMDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAPer
-La2IxQHWRFvX5mC8OgYSsZTjNcEGz0vLwBsdckQiBWWgrLdnU6+raS/SlriY4qcZ
-g8CJkhj8CdLBn6UxwdwOy+tGYjyAFCkV2yQ68euyNqwWgT6iiq/dn1kjWzamC18H
-U0LN/c7eieldhdI8edSF9Z6Drjt7s8glP4Lrd1FM5NXWros06fpEs61BoMZrIyei
-ptB4M7XBGJW6mQx3trnN4FnDZIyzNf9H+Z4XvXnn/URLMd0S3hS2uxVS7OGluKY6
-hhXfpcOGwUKcQmE7coI0mhZ9TAsG7h++J/A7aBp3eWr9eXzeFmwg7sHRBtd3LaD+
-yBLXuUFaPHJyOSFCeiys1O1Oh2CGpJIfPHlqmCQmTQrNEtioJyPRVAZamwio+mYt
-EsI8ssPW3/FNEe93cHd88BDhCDtz5oiQiGyflsCWSh4SwjFVVw7jgRGzmkn2TfHv
-yjiiexS8LeleqwMQ95e9dcVbktxBvDnPd0xCAXVL0y2P31DXLYe/2806C/21KWRU
-Z/EtLTQKpxJWhqsZwSZSpxjb6h3l8D9HAm5w4I/4w3JB40R7GJFWtuwh+clRnzC2
-xtN9cGfe+LXG0SG6ObUu9XBVBwNIL2xNgz+eSCv1n/8hlahoZySLtj0AKFQPyWvw
-Bitvvwk8uq3NPpBiz2nilHG3nnzlp+TK6+pjOHOrAgMBAAGjUDBOMB0GA1UdDgQW
-BBTqVEEVOf9SV47Nz0su8/MYAWOy4jAfBgNVHSMEGDAWgBTqVEEVOf9SV47Nz0su
-8/MYAWOy4jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQAXjshVZ5td
-ZqClqmZUEEWFh8oDk8lrRkZfXUmThQiKYq7NrLecbquDh1Mglq3zVxndZMAZVzrQ
-3U/EJ7B+LXfd5fnl91+qb5d1bJBs/Om/AyFA/bBnOyYPzkZWf+M8nItzQyOJX7ZO
-kzIOakaet6HR6T7ADk7vfSjqnRLywNL/cq3/if9c5WGh5NUSteltuDHOsm3DwvN4
-aFP+rngiYF1j509wbZOO7koIwZZUG9g0Etv0T8u7xXyZkYxjEfrr4uMf6121PoaP
-7mMU1Msuqw7idRMOj7mL5tIpu1ihw/a2pWqaXkxNsQXpOv+HtpBZ28pzqAtcHt8q
-r5V5Gm+W37RMlnIDsJwgEfA6FKEDqahSRmYnh8v+F9aDRDpGYpwRtK3k0tiy9Kvp
-8o16aCCqLtFU+Lme2NzkcFQubPmkan21M6/VTGP7UrgtvhXAaqYcTQBq/YJ4TiXz
-SBZgjywUi1nMZAzG4KS4jFR27Kdiul3G10I/M7nPtNq51uNspiO117zRo/8qD4wE
-BOoxiQw0f7/UPW8uznHU3DR3JUkTTlUfKHrfB7RZvkqw15bLkH8DpgINkjW+PFzI
-OkY6KYbZj/wwCYBw3rxMb4oY3Lv0S6cLmLvxmkG8eizY9ymwNlr/YAwPeyzuLPRf
-j6+cBKFT97et/lUMyfKVwbmuJNgtABRRcw==
------END CERTIFICATE-----
diff --git a/natmd-test-common/overlay/etc/credentials/test-metadata-signer.crt b/natmd-test-common/overlay/etc/credentials/test-metadata-signer.crt
new file mode 100644
index 00000000..fd32584f
--- /dev/null
+++ b/natmd-test-common/overlay/etc/credentials/test-metadata-signer.crt
@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFNDCCAxygAwIBAgIJAL6+XWRCiDY3MA0GCSqGSIb3DQEBBQUAMC8xDzANBgNV
+BAoMBlNDVEVTVDEcMBoGA1UEAwwTU3dlZGVuIENvbm5lY3QgdGVzdDAeFw0yMjAz
+MjkwODM3MDhaFw00MjAzMjkwODM3MDhaMC8xDzANBgNVBAoMBlNDVEVTVDEcMBoG
+A1UEAwwTU3dlZGVuIENvbm5lY3QgdGVzdDCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAKxgj9bio5mDrDYo8CuAtZKrZY9nWg6kFxqTVKXSEzghHT4EMoPf
+6gDktAAW5cdz5rRxlzZUdjzqPOF5nnE5l6VE41R/s/4RBp0Eq84WO+MM5+LVJfPd
+Mv0uKrss9GGPPbrqt01C0j3cSgpGkjGFyCNw+RS3C+SsjsqguB9AucYHnSL//jXV
+RhX6ol4/bwgYZTQ+3qIUfhN1ymntgi05Bc9kDGmW4Zli2JQkIjgpvFRDx79+05bO
+L9YMm6zdWVSVvg6RKPMEThuOOwc4tZe3omT6PQkUzJHRKvWFTSEEOJ715mZ/qRjr
+FU90k5DhNusLLngVjIHf8Is/J9ORPrbLFX5jEBMwVst8LW9CpGV5ezARH7LgNMgZ
+a3BNWPYRuLb6hmKldSWk3XQUWYVjIlkt3NolcFKzGYRjzdP5un4HOwXy1XU2razN
+GlHOpAR1fz/floB7zMBdaDNHS0oYilz/stjuFXXlBAACIIBaH8+xm/LYw4s5+PIj
+3fZ6QFY+kN/gpWcqx+o9yjP9TY18e/K+2VMFskrZfQZZh2Tfu/9Nauctfis5Yvo6
+Lv/iPAVS5EKgEyifMxRuU4Vlc72u+mSldwuo6s7l9pnjTYsN9RIbWfPjdF6TUz5U
+UDIbrJDUHcarRGG7q8wD2b5UOlPWLpEWRRFlXaM6T+/9ZQLTmLeZkK03AgMBAAGj
+UzBRMB0GA1UdDgQWBBRoLO88TwZaByh/BJ6rJaWbTn87SDAfBgNVHSMEGDAWgBRo
+LO88TwZaByh/BJ6rJaWbTn87SDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
+BQUAA4ICAQBfwvv/J2SwWaOLbVNxRmjHOiXjdgWNrqwjJ5olqCwW8L150SSxf32v
+BSyBycUShXtM8M4J5PkhHRm5hO5FJQF9A0In0lln4u1Yf8j4GAfk+Pwvu5oE9nal
+h75QpIGV2WqGkS5qYuVrferMb+nbbAcho8HCpOLikW+TCtxNzcTQJEexUK6npw2R
+2y3ua86bFolVp3TyRrYBWuTZIVwOwsOLdMNtncIw9n5kCuPbqKn8NcjbdQ1g0OAy
+PG4D9bPG9Ju98Xf+XiqRK/zlE4eYUV6tuiajsnfq3zaNarcR1IHFAsW326ZaIbpm
+Y5FL3qNY4uwxCiVRZB7PPeJN/XZfxaBYb7zZASN91Hsth9v3r4H9f2jGlZLbvPAh
+RL8cyx3a+LH8GQyh/OnhueuB5ovp74p7EugHu0uDtCCMKMjMpsYjVSzl5ummqNew
+3fyKR0Nmr8DWX4dlpohuenDv4umKsSJODt1huW5gcwQp8Y719NLqNZuIjnr9qZtE
+/qm6mWeDfp76+LemSdFfX2Nkb8+ZNHdUXUqPynkH1BCocmB91VObKTP4enQyp/+U
+sdIQt6anGSU/LC7FsggbzSo6xdhuYxhh70+xAzGe2FFQHtYHOX6u38Agw+IB2462
+W3H4unQMgNcLSYEAjclVYqNmV82EaX2R1TuF5oVyI9PSunNxHTyBQQ==
+-----END CERTIFICATE-----
diff --git a/natmd-test-common/overlay/etc/mirror-mdq/template/index.html b/natmd-test-common/overlay/etc/mirror-mdq/template/index.html
index db0ab988..3fdf60c3 100644
--- a/natmd-test-common/overlay/etc/mirror-mdq/template/index.html
+++ b/natmd-test-common/overlay/etc/mirror-mdq/template/index.html
@@ -43,34 +43,34 @@
          <h2>Signeringscertifikat</h2>
          <div class="code"><pre>
 -----BEGIN CERTIFICATE-----
-MIIFIjCCAwoCCQCVO3v9xSA+FDANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJT
-RTEnMCUGA1UECgweU3dlZGlzaCBFLWlkZW50aWZpY2F0aW9uIEJvYXJkMRswGQYD
-VQQDDBJRQSBNZXRhZGF0YSBTaWduZXIwHhcNMTcxMjE5MTIyMDI1WhcNMjcxMjE3
-MTIyMDI1WjBTMQswCQYDVQQGEwJTRTEnMCUGA1UECgweU3dlZGlzaCBFLWlkZW50
-aWZpY2F0aW9uIEJvYXJkMRswGQYDVQQDDBJRQSBNZXRhZGF0YSBTaWduZXIwggIi
-MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDYzcmlNTMkBzIYUXxT13zNMakh
-xR9BO1Qnlt2euUNdvL8FhgiNo+2AJDxFWts8nsg9Jam15F38nTqRMt4r1zFHYFJ5
-22h8urckpwvFVu/kjQrY8pztLE/pPvGXLPlySDkiRifCGibXuACngZx5chCwNs2h
-2OoMgKH7d5aZmUcB2mIc/Ybd98W9jtch1gh5/QM0aJsYnDTYuB840YGwHXCyiBUf
-1teUT9bJ/Y90OSXBdib9kuOmtQNMTYtyX8FAodYXVx8ibXNDfhdGaBJh+2J4lFTA
-DQQ1tM1YigZyvBuslBcuLDfZce0OaWPYPAf8PE8voxJhGkA026GGNjXP/9nRK146
-bkN4nd/Aa6842aYEOjjcDAl43tjHKZBu0+pnq/2GRiN7Dw4Y+Td/2y8PqD/W87CV
-ttrU6yniSMr7Y1+TfzzESSVPXs+csyatH9MJ2IA184Oh7TL6tPh5N96ugh7s85pN
-zswG+Gouw1BVCfqpSJmmNMheEOr6igOYQ0LY5aOooLoqET9gu0ks9cixjANFhnhE
-vRVkMfbnFVAnvXQEWPQY5NgqO4b0Z65ey011L+slNo6EIiw0FkznAwER0aYzrM2r
-hs/hJAAbjnxEhgMKN9bdoXpnrAehwbTOTipOWwrdcd3IKNdDEyFY15j5rGgyIBcK
-8gNnvGJLKcaC4vBd1QIDAQABMA0GCSqGSIb3DQEBCwUAA4ICAQBuws48HrfwW/Eq
-WN4+VSZ1cMgkp/mgqyyDdXoCPUf5o7ro17oDSocmpdQypiCr6M88MACBX8cqKmie
-kIyptrzp1x2seo8rTJpno97dt3hSwbe6+SbRh2bjDpDzL2ecrtv/GXjR41b2CbMO
-wu4WTgiFhWmKGNDNcEem37VUpKEYe7u/ucie71AQi49jM0rJ5uSVdBONKj3iAH5d
-mckw2nt6HKMJ0S+ckM/aq+m8ACgAyYmMr74Yt6wcpl/NORtIxaGUeT7Z8rN7TUmk
-gP9scbYF16xJJkxtylnK2BrSwSFOIuB5KJo2xxhuMffxEgdy4711TfwMCUaTPKmF
-dlYzPKeBaYzWFU42jcVsiQz4mSqgvS2dS8nZpYe2K0zHIzKwytn+HQ36KhRRDAVR
-7aKH9S8FZJXC6wqXFdEwwZujkGhu/BxgfjGkde8qOQMUwHboX9+aflQ9okB1Tha6
-xVB1kG86WdgJLmrsfqaX1FVyO761ZXYHTuoAZ0iuzIRhteUksfRZchnKpUX0fF1i
-yB9M0E6JfqvFeVfLlo8c2FI4MUYFWgqciizaXSfw0waMFdX5+U33eXr1RWF0POZX
-JERf83JkjVLanESP9/U9nsZYgIiSX88PahYtuSZLhqamzzFvK+wuVcNKark8s1kS
-2d8EIOY6h4jmS2ds9ORaavkV/xxTAA==
+MIIFNDCCAxygAwIBAgIJAL6+XWRCiDY3MA0GCSqGSIb3DQEBBQUAMC8xDzANBgNV
+BAoMBlNDVEVTVDEcMBoGA1UEAwwTU3dlZGVuIENvbm5lY3QgdGVzdDAeFw0yMjAz
+MjkwODM3MDhaFw00MjAzMjkwODM3MDhaMC8xDzANBgNVBAoMBlNDVEVTVDEcMBoG
+A1UEAwwTU3dlZGVuIENvbm5lY3QgdGVzdDCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAKxgj9bio5mDrDYo8CuAtZKrZY9nWg6kFxqTVKXSEzghHT4EMoPf
+6gDktAAW5cdz5rRxlzZUdjzqPOF5nnE5l6VE41R/s/4RBp0Eq84WO+MM5+LVJfPd
+Mv0uKrss9GGPPbrqt01C0j3cSgpGkjGFyCNw+RS3C+SsjsqguB9AucYHnSL//jXV
+RhX6ol4/bwgYZTQ+3qIUfhN1ymntgi05Bc9kDGmW4Zli2JQkIjgpvFRDx79+05bO
+L9YMm6zdWVSVvg6RKPMEThuOOwc4tZe3omT6PQkUzJHRKvWFTSEEOJ715mZ/qRjr
+FU90k5DhNusLLngVjIHf8Is/J9ORPrbLFX5jEBMwVst8LW9CpGV5ezARH7LgNMgZ
+a3BNWPYRuLb6hmKldSWk3XQUWYVjIlkt3NolcFKzGYRjzdP5un4HOwXy1XU2razN
+GlHOpAR1fz/floB7zMBdaDNHS0oYilz/stjuFXXlBAACIIBaH8+xm/LYw4s5+PIj
+3fZ6QFY+kN/gpWcqx+o9yjP9TY18e/K+2VMFskrZfQZZh2Tfu/9Nauctfis5Yvo6
+Lv/iPAVS5EKgEyifMxRuU4Vlc72u+mSldwuo6s7l9pnjTYsN9RIbWfPjdF6TUz5U
+UDIbrJDUHcarRGG7q8wD2b5UOlPWLpEWRRFlXaM6T+/9ZQLTmLeZkK03AgMBAAGj
+UzBRMB0GA1UdDgQWBBRoLO88TwZaByh/BJ6rJaWbTn87SDAfBgNVHSMEGDAWgBRo
+LO88TwZaByh/BJ6rJaWbTn87SDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
+BQUAA4ICAQBfwvv/J2SwWaOLbVNxRmjHOiXjdgWNrqwjJ5olqCwW8L150SSxf32v
+BSyBycUShXtM8M4J5PkhHRm5hO5FJQF9A0In0lln4u1Yf8j4GAfk+Pwvu5oE9nal
+h75QpIGV2WqGkS5qYuVrferMb+nbbAcho8HCpOLikW+TCtxNzcTQJEexUK6npw2R
+2y3ua86bFolVp3TyRrYBWuTZIVwOwsOLdMNtncIw9n5kCuPbqKn8NcjbdQ1g0OAy
+PG4D9bPG9Ju98Xf+XiqRK/zlE4eYUV6tuiajsnfq3zaNarcR1IHFAsW326ZaIbpm
+Y5FL3qNY4uwxCiVRZB7PPeJN/XZfxaBYb7zZASN91Hsth9v3r4H9f2jGlZLbvPAh
+RL8cyx3a+LH8GQyh/OnhueuB5ovp74p7EugHu0uDtCCMKMjMpsYjVSzl5ummqNew
+3fyKR0Nmr8DWX4dlpohuenDv4umKsSJODt1huW5gcwQp8Y719NLqNZuIjnr9qZtE
+/qm6mWeDfp76+LemSdFfX2Nkb8+ZNHdUXUqPynkH1BCocmB91VObKTP4enQyp/+U
+sdIQt6anGSU/LC7FsggbzSo6xdhuYxhh70+xAzGe2FFQHtYHOX6u38Agw+IB2462
+W3H4unQMgNcLSYEAjclVYqNmV82EaX2R1TuF5oVyI9PSunNxHTyBQQ==
 -----END CERTIFICATE-----
        </pre></div>
         </div>