diff --git a/demw-1.qa.sveidas.se/overlay/etc/hiera/data/local.yaml b/demw-1.qa.sveidas.se/overlay/etc/hiera/data/local.yaml
new file mode 100644
index 00000000..0ab9f8c0
--- /dev/null
+++ b/demw-1.qa.sveidas.se/overlay/etc/hiera/data/local.yaml
@@ -0,0 +1,3 @@
+---
+demw_tls_server_crt: MIIEcTCCA1mgAwIBAgIIDI0LEBD/wRIwDQYJKoZIhvcNAQELBQAwVzEnMCUGA1UEAwweYm9zIENBIGVJRCBDb21tdW5pY2F0aW9uIENlcnRzMR8wHQYDVQQKDBZicmVtZW4gb25saW5lIHNlcnZpY2VzMQswCQYDVQQGEwJERTAeFw0xMzA1MDcwNzQ5MjRaFw0xNjA1MDYwNzQ5MjRaMGgxHjAcBgNVBAMMFWRldi5nb3Zlcm5pa3VzLWVpZC5kZTEYMBYGA1UECwwPdGVzdGNlcnRpZmljYXRlMR8wHQYDVQQKDBZicmVtZW4gb25saW5lIHNlcnZpY2VzMQswCQYDVQQGEwJkZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9ea6dQveXgc23F7jteqN9L023MpOI7BnqD4YxsrOMfEhHBj1tcr1VpZgxtamhHKEJEqptN5ObotyA/wKqeIBEzLgfLGqMyPqnSyejELRql1KYi+moCgMWNiU5FAfhd29Rgr8rPhPtBSgkO7DQdXzaTQxDxQssUTlK5AifIl/f0+/emGZUknAIfXxgXlNmuSCijAt1qoNkd+VS05unQFYKqb3BfxFQDgHqdmg0caPDvb5KHYuTMGFhmRe3B8lt5ffM+QaIK8q+qTy2rU/4jS331tauGdxDv/JniOV2z5gzut4H42Naek9SPjgotk0ON8B4ZuSZf23pJ9GqRH1v9u+MCAwEAAaOCAS4wggEqMAwGA1UdEwEB/wQCMAAwPwYDVR0lBDgwNgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBAYKKwYBBAGCNxQCAgYKKwYBBAGCNwoDDDAfBgNVHSMEGDAWgBQFIqk8+KQR/Sta43Lw85czVJlxjzAOBgNVHQ8BAf8EBAMCBLAwHQYDVR0OBBYEFFdqnSDAvZJe8F6/4VbhECPNIZf/MEsGCCsGAQUFBwEBBD8wPTA7BggrBgEFBQcwAYYvaHR0cDovL29jc3AuYm9zLWJyZW1lbi5kZS9wdWJsaWN3ZWIvc3RhdHVzL29jc3AwPAYDVR0RBDUwM4IVZGV2LmdvdmVybmlrdXMtZWlkLmRlghpkZXYtZGVtby5nb3Zlcm5pa3VzLWVpZC5kZTANBgkqhkiG9w0BAQsFAAOCAQEAMZaY6wFGQTrb7Ke2cST6ZJrUhs1H70awcWO5abMmFWipwqhaW95oUmZvMFxEZcehKgDej1ltHhwkvcCbhM97+pxNLJWnmwn8fpDn28xkkG1pcnKfz7Nj+Nn66NMFeSU4LCKjmfqhmiqaxk6JHOqHwoG8c2b6X5krVLhhhbTAW4oojmJUhrjeeglPpD60JneVRy1w8qoRaDd5UFaMgwRgi0Nom8qaIcYTZuJYhIRb5sTR2SAVjbpEMwZq3NqczOFTafB6HFsLiHB/6RSBtqAC9KMC9m4LPEQvAWN8+sTltYPio/IoTIUVrU13uzOmxTGmubQx2St/7IBy5m7dlk0WUQ==
+demw_tls_client_cert: MIIEBjCCAe6gAwIBAgIEW5ZcOjANBgkqhkiG9w0BAQsFADB0MQswCQYDVQQGEwJERTEPMA0GA1UECAwGQnJlbWVuMQ8wDQYDVQQHDAZCcmVtZW4xFjAUBgNVBAoMDUdvdmVybmlrdXMgS0cxDDAKBgNVBAsMA0FBQTEdMBsGA1UEAwwUVExTIENsaWVudCBUZXN0IFJvb3QwHhcNMTgwOTEwMTE1NzQ2WhcNMjgwOTEwMTE1NzQ2WjAWMRQwEgYDVQQDDAtTRUVVTVdURVNUMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIcU537xerJodmr6KVPdxqq7Q5mFWGPnzQEVn1QaGZXlqT09173WDxxyorQKW92FmMhW4VySPBt2dE9JsIS3FCgOjHl8yBo9EsMPNVsQy6eBBoXzL4e1rcEKMFJ1es915MIuFLqEKf2ZI3S7JuX0i8OsgTdCc/hHzyvikygow/sNiTMkYnFMfCCJhfIcfOPhoEBYVkoaLpRxqQPXR60izf5YDPOZlTcSIhBPXKcLjoflfnodfdKj7d/50iePmsj4UJ7dKB3YJzeR/ibUGe+dDeberMfQbMRcbF4vEa/zEL09ZM+5H3eL1DFzsYKFtDQ/0QM1LLldJHw6kWmajMykFZMCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAZld1sgQmvKSv1ShGCpKGfExyr2fHOcvNmk54Btswbh/FoPuNl/icRnMZwsWQfvfo9sz5tmZZRVfdPde8IfHSJfWhFiY+lHlHgSP20mOvDQT5/RNRh0e+0FqUw9wweIWrkMaPCwDxfGFlIEn2IJWZ7Lf4OR4AbqrkOHh6LcIOUvdqphyRVT22aaIaxACj///K34Z/2KlJUY/kRLzNRWow9Og6poeBFqz4mg2RZgmA1zEglSJP3YYCq9OcDzVgXPiGbZpkwMRgWEmnfq/t1apPfKplmllP0xA6Ej8pivZt3qd320gSfRT13CD/58OOBhT+DXD09dZ+Z3qXzULwlGU2uskyP8sBX+skpnaccaTxYa0T69yzOhi6ECNZOxs/x5frDpytVZ78cJIS79EpE9s1CfcaOz1wrG90p0geecE8cE6U787t19pw21uD5QGEwIIGIc47HGL54kYJjrJDLbbC3tZY8Qn3wwNBlEcNbao7Jwg5gyaMHH+k2irrV/VvTnSZNvCfbaxUx48eQROHRmEY7sfkvogAgapqJf/+clGmqpOeTbczvKdRsQOtnv+XUwMLh3Jd7MpMzpDxQ2AWCuqnoec8hZoJwXFH0Gd1B1DK6QOrsSnnEYMZWxqz75JEvIkc2OTz+C82ffuYIIzRrGpfmC3RMxnfQiRhT7Vu5++6WyM=
diff --git a/demw-1.qa.sveidas.se/overlay/etc/hiera/data/secrets.yaml.asc b/demw-1.qa.sveidas.se/overlay/etc/hiera/data/secrets.yaml.asc
index 0ff1981c..762a228e 100644
--- a/demw-1.qa.sveidas.se/overlay/etc/hiera/data/secrets.yaml.asc
+++ b/demw-1.qa.sveidas.se/overlay/etc/hiera/data/secrets.yaml.asc
@@ -3,117 +3,143 @@ STATUS=UPDATED
 -----BEGIN PGP MESSAGE-----
 Version: GnuPG v2
 
-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
-zpVYsmXo28pXtNB/ADO8Mw==
-=dVkO
+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
+9A==
+=28Dt
 -----END PGP MESSAGE-----
diff --git a/demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/POSeIDAS.xml.sh b/demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/POSeIDAS.xml.sh
index a99c7daf..607b6b1c 100755
--- a/demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/POSeIDAS.xml.sh
+++ b/demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/POSeIDAS.xml.sh
@@ -16,16 +16,16 @@ cat<<EOF
     </TimerConfiguration>
     <ServiceProvider entityID="se-de-middleware" enabled="true">
         <EPAConnectorConfiguration updateCVC="true">
-            <CVCRefID>se-de-middleware</CVCRefID>
+            <CVCRefID>qa-se-de-middleware</CVCRefID>
             <PkiConnectorConfiguration>
                 <blackListTrustAnchor>MIIEcTCCA1mgAwIBAgIIDI0LEBD/wRIwDQYJKoZIhvcNAQELBQAwVzEnMCUGA1UEAwweYm9zIENBIGVJRCBDb21tdW5pY2F0aW9uIENlcnRzMR8wHQYDVQQKDBZicmVtZW4gb25saW5lIHNlcnZpY2VzMQswCQYDVQQGEwJERTAeFw0xMzA1MDcwNzQ5MjRaFw0xNjA1MDYwNzQ5MjRaMGgxHjAcBgNVBAMMFWRldi5nb3Zlcm5pa3VzLWVpZC5kZTEYMBYGA1UECwwPdGVzdGNlcnRpZmljYXRlMR8wHQYDVQQKDBZicmVtZW4gb25saW5lIHNlcnZpY2VzMQswCQYDVQQGEwJkZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9ea6dQveXgc23F7jteqN9L023MpOI7BnqD4YxsrOMfEhHBj1tcr1VpZgxtamhHKEJEqptN5ObotyA/wKqeIBEzLgfLGqMyPqnSyejELRql1KYi+moCgMWNiU5FAfhd29Rgr8rPhPtBSgkO7DQdXzaTQxDxQssUTlK5AifIl/f0+/emGZUknAIfXxgXlNmuSCijAt1qoNkd+VS05unQFYKqb3BfxFQDgHqdmg0caPDvb5KHYuTMGFhmRe3B8lt5ffM+QaIK8q+qTy2rU/4jS331tauGdxDv/JniOV2z5gzut4H42Naek9SPjgotk0ON8B4ZuSZf23pJ9GqRH1v9u+MCAwEAAaOCAS4wggEqMAwGA1UdEwEB/wQCMAAwPwYDVR0lBDgwNgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBAYKKwYBBAGCNxQCAgYKKwYBBAGCNwoDDDAfBgNVHSMEGDAWgBQFIqk8+KQR/Sta43Lw85czVJlxjzAOBgNVHQ8BAf8EBAMCBLAwHQYDVR0OBBYEFFdqnSDAvZJe8F6/4VbhECPNIZf/MEsGCCsGAQUFBwEBBD8wPTA7BggrBgEFBQcwAYYvaHR0cDovL29jc3AuYm9zLWJyZW1lbi5kZS9wdWJsaWN3ZWIvc3RhdHVzL29jc3AwPAYDVR0RBDUwM4IVZGV2LmdvdmVybmlrdXMtZWlkLmRlghpkZXYtZGVtby5nb3Zlcm5pa3VzLWVpZC5kZTANBgkqhkiG9w0BAQsFAAOCAQEAMZaY6wFGQTrb7Ke2cST6ZJrUhs1H70awcWO5abMmFWipwqhaW95oUmZvMFxEZcehKgDej1ltHhwkvcCbhM97+pxNLJWnmwn8fpDn28xkkG1pcnKfz7Nj+Nn66NMFeSU4LCKjmfqhmiqaxk6JHOqHwoG8c2b6X5krVLhhhbTAW4oojmJUhrjeeglPpD60JneVRy1w8qoRaDd5UFaMgwRgi0Nom8qaIcYTZuJYhIRb5sTR2SAVjbpEMwZq3NqczOFTafB6HFsLiHB/6RSBtqAC9KMC9m4LPEQvAWN8+sTltYPio/IoTIUVrU13uzOmxTGmubQx2St/7IBy5m7dlk0WUQ==</blackListTrustAnchor>
                 <masterListTrustAnchor>MIIELTCCA7SgAwIBAgIBBTAKBggqhkjOPQQDAzBVMQswCQYDVQQGEwJERTENMAsGA1UECgwEYnVuZDEMMAoGA1UECwwDYnNpMQ0wCwYDVQQFEwQwMDA0MRowGAYDVQQDDBFURVNUIGNzY2EtZ2VybWFueTAeFw0xNTA5MjMwODU2MzlaFw0yNjAzMjMyMzU5NTlaMGAxCzAJBgNVBAYTAkRFMQ0wCwYDVQQKDARidW5kMQwwCgYDVQQLDANic2kxDTALBgNVBAUTBDAwMDYxJTAjBgNVBAMMHFRFU1QgQ1NDQSBNYXN0ZXIgTGlzdCBTaWduZXIwggEzMIHsBgcqhkjOPQIBMIHgAgEBMCwGByqGSM49AQECIQCp+1fboe6pvD5mCpCdg41ybjv2I9UmICggE0gdH25TdzBEBCB9Wgl1/CwwV+72dTBBev/n+4BVwSbcXGzpSktE8zC12QQgJtxcbOlKS0TzMLXZu9d8v5WEFilc9+HOa8zcGP+MB7YEQQSL0q65y35XyyxLSC/8gbevud4n4eO9I8I6RFO9ms4yYlR++DXD2sT9l/hGGhRhHcnCd0UTLe2OVFwdVMcvBGmXAiEAqftX26Huqbw+ZgqQnYONcYw5eqO1Yab3kB4OgpdIVqcCAQEDQgAEitE7LDrEMzLs7tPp6pe6BzZJHaThJzm49mUw2x3gKS1iYIeNqXngL5E0sX7MDZZp13dikfbKVln+8k8IiNKrVKOCAYwwggGIMB8GA1UdIwQYMBaAFHD8PNdfzGkLdI7YpGbmsFvP3TmdMB0GA1UdDgQWBBRioyCrfGByzK9GY8va0e1lUoy8czAOBgNVHQ8BAf8EBAMCB4AwKwYDVR0QBCQwIoAPMjAxNTA5MjMwODU2MzlagQ8yMDE4MDkyMzIzNTk1OVowFgYDVR0gBA8wDTALBgkEAH8ABwMBAQEwUQYDVR0RBEowSIEYY3NjYS1nZXJtYW55QGJzaS5idW5kLmRlhhxodHRwczovL3d3dy5ic2kuYnVuZC5kZS9jc2NhpA4wDDEKMAgGA1UEBwwBRDBRBgNVHRIESjBIgRhjc2NhLWdlcm1hbnlAYnNpLmJ1bmQuZGWGHGh0dHBzOi8vd3d3LmJzaS5idW5kLmRlL2NzY2GkDjAMMQowCAYDVQQHDAFEMBQGA1UdJQEB/wQKMAgGBmeBCAEBAzA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vd3d3LmJzaS5idW5kLmRlL3Rlc3RfY3NjYV9jcmwwCgYIKoZIzj0EAwMDZwAwZAIwI7b8uJ2wSKDA6YjzLtR9CyOQorXfilVJDVkYkk5zEmVbzA4vLLizjemfYZZQXY/YAjAf6xsMtIIIwJHch1J6Akm8cdjfR653xOx2cLgPCPLOXws3b4Auk2xtolq8YSzD1kA=</masterListTrustAnchor>
                 <defectListTrustAnchor>MIIELTCCA7SgAwIBAgIBBDAKBggqhkjOPQQDAzBVMQswCQYDVQQGEwJERTENMAsGA1UECgwEYnVuZDEMMAoGA1UECwwDYnNpMQ0wCwYDVQQFEwQwMDA0MRowGAYDVQQDDBFURVNUIGNzY2EtZ2VybWFueTAeFw0xNTA5MjMwODU1MjZaFw0yNjAzMjMyMzU5NTlaMGAxCzAJBgNVBAYTAkRFMQ0wCwYDVQQKDARidW5kMQwwCgYDVQQLDANic2kxDTALBgNVBAUTBDAwMDYxJTAjBgNVBAMMHFRFU1QgQ1NDQSBEZWZlY3QgTGlzdCBTaWduZXIwggEzMIHsBgcqhkjOPQIBMIHgAgEBMCwGByqGSM49AQECIQCp+1fboe6pvD5mCpCdg41ybjv2I9UmICggE0gdH25TdzBEBCB9Wgl1/CwwV+72dTBBev/n+4BVwSbcXGzpSktE8zC12QQgJtxcbOlKS0TzMLXZu9d8v5WEFilc9+HOa8zcGP+MB7YEQQSL0q65y35XyyxLSC/8gbevud4n4eO9I8I6RFO9ms4yYlR++DXD2sT9l/hGGhRhHcnCd0UTLe2OVFwdVMcvBGmXAiEAqftX26Huqbw+ZgqQnYONcYw5eqO1Yab3kB4OgpdIVqcCAQEDQgAEphPfzRAJDfLG1r0JpAJYgdRvKc0DacjGhbxhuEWlMRB1XpV3pKPpVHUuraDEaC4Ru8q2W4etyA4Swc8JQ6jdXaOCAYwwggGIMB8GA1UdIwQYMBaAFHD8PNdfzGkLdI7YpGbmsFvP3TmdMB0GA1UdDgQWBBSFeLqnCPkXciiQQOzwVzQDNiNWBDAOBgNVHQ8BAf8EBAMCB4AwKwYDVR0QBCQwIoAPMjAxNTA5MjMwODU1MjZagQ8yMDE4MDkyMzIzNTk1OVowFgYDVR0gBA8wDTALBgkEAH8ABwMBAQEwUQYDVR0RBEowSIEYY3NjYS1nZXJtYW55QGJzaS5idW5kLmRlhhxodHRwczovL3d3dy5ic2kuYnVuZC5kZS9jc2NhpA4wDDEKMAgGA1UEBwwBRDBRBgNVHRIESjBIgRhjc2NhLWdlcm1hbnlAYnNpLmJ1bmQuZGWGHGh0dHBzOi8vd3d3LmJzaS5idW5kLmRlL2NzY2GkDjAMMQowCAYDVQQHDAFEMBQGA1UdJQEB/wQKMAgGBmeBCAEBAzA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vd3d3LmJzaS5idW5kLmRlL3Rlc3RfY3NjYV9jcmwwCgYIKoZIzj0EAwMDZwAwZAIwPAvVTvhJuX0dIyd7Ouv0t03J2KA08JehN+RA6oVU7xvS7RbCLIcKNYqVRnC4eJrOAjB1X89X1lH/0Fq3HH1tKXw3ELw62dBrHeHGsn3kcWNXxYqr5iRobwJru3FPk5ka34s=</defectListTrustAnchor>
                 <policyImplementationId>govDvca</policyImplementationId>
                 <sslKeys id="default">
-                    <serverCertificate>MIIEcTCCA1mgAwIBAgIIDI0LEBD/wRIwDQYJKoZIhvcNAQELBQAwVzEnMCUGA1UEAwweYm9zIENBIGVJRCBDb21tdW5pY2F0aW9uIENlcnRzMR8wHQYDVQQKDBZicmVtZW4gb25saW5lIHNlcnZpY2VzMQswCQYDVQQGEwJERTAeFw0xMzA1MDcwNzQ5MjRaFw0xNjA1MDYwNzQ5MjRaMGgxHjAcBgNVBAMMFWRldi5nb3Zlcm5pa3VzLWVpZC5kZTEYMBYGA1UECwwPdGVzdGNlcnRpZmljYXRlMR8wHQYDVQQKDBZicmVtZW4gb25saW5lIHNlcnZpY2VzMQswCQYDVQQGEwJkZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9ea6dQveXgc23F7jteqN9L023MpOI7BnqD4YxsrOMfEhHBj1tcr1VpZgxtamhHKEJEqptN5ObotyA/wKqeIBEzLgfLGqMyPqnSyejELRql1KYi+moCgMWNiU5FAfhd29Rgr8rPhPtBSgkO7DQdXzaTQxDxQssUTlK5AifIl/f0+/emGZUknAIfXxgXlNmuSCijAt1qoNkd+VS05unQFYKqb3BfxFQDgHqdmg0caPDvb5KHYuTMGFhmRe3B8lt5ffM+QaIK8q+qTy2rU/4jS331tauGdxDv/JniOV2z5gzut4H42Naek9SPjgotk0ON8B4ZuSZf23pJ9GqRH1v9u+MCAwEAAaOCAS4wggEqMAwGA1UdEwEB/wQCMAAwPwYDVR0lBDgwNgYIKwYBBQUHAwEGCCsGAQUFBwMCBggrBgEFBQcDBAYKKwYBBAGCNxQCAgYKKwYBBAGCNwoDDDAfBgNVHSMEGDAWgBQFIqk8+KQR/Sta43Lw85czVJlxjzAOBgNVHQ8BAf8EBAMCBLAwHQYDVR0OBBYEFFdqnSDAvZJe8F6/4VbhECPNIZf/MEsGCCsGAQUFBwEBBD8wPTA7BggrBgEFBQcwAYYvaHR0cDovL29jc3AuYm9zLWJyZW1lbi5kZS9wdWJsaWN3ZWIvc3RhdHVzL29jc3AwPAYDVR0RBDUwM4IVZGV2LmdvdmVybmlrdXMtZWlkLmRlghpkZXYtZGVtby5nb3Zlcm5pa3VzLWVpZC5kZTANBgkqhkiG9w0BAQsFAAOCAQEAMZaY6wFGQTrb7Ke2cST6ZJrUhs1H70awcWO5abMmFWipwqhaW95oUmZvMFxEZcehKgDej1ltHhwkvcCbhM97+pxNLJWnmwn8fpDn28xkkG1pcnKfz7Nj+Nn66NMFeSU4LCKjmfqhmiqaxk6JHOqHwoG8c2b6X5krVLhhhbTAW4oojmJUhrjeeglPpD60JneVRy1w8qoRaDd5UFaMgwRgi0Nom8qaIcYTZuJYhIRb5sTR2SAVjbpEMwZq3NqczOFTafB6HFsLiHB/6RSBtqAC9KMC9m4LPEQvAWN8+sTltYPio/IoTIUVrU13uzOmxTGmubQx2St/7IBy5m7dlk0WUQ==</serverCertificate>
-                    <clientCertificate>MIID4zCCAsugAwIBAgIIdq/dlyQqL9wwDQYJKoZIhvcNAQELBQAwXDEkMCIGA1UEAwwbR292ZXJuaWt1cyBSb290IENBIDIgZWlkOlBOMRYwFAYDVQQKDA1Hb3Zlcm5pa3VzIEtHMQ8wDQYDVQQHDAZCcmVtZW4xCzAJBgNVBAYTAkRFMB4XDTE3MDQxMjA5NDUyN1oXDTIwMDQxMTA5NDUyN1owYjEfMB0GA1UEAwwWU0UtRUlEQVMtTVcuY2xpZW50LXBraTEaMBgGA1UECwwRZWlkIGNvbW11bmljYXRpb24xFjAUBgNVBAoMDUdvdmVybmlrdXMgS0cxCzAJBgNVBAYTAmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAkpvhTOpd9x+AbPoNDwrVwjoEJFHjCjsW7n8t/hr1gIQWDu9wDQcuTea+GkFVPL1ghYc0dUeXOFnCXYQ5PcoUVlCZay8L+TuCMC6dsXO66HIIpYNhe+wE/KpY450mD/eIli6vAA5GS3+RU90ottjKw+njuDiFMkO2ExzYG0F6kI+rggCD23SwKj5ZwlpPeLGtvZDHGbmdLb2EOa5hRBjp1469E1izwbg6AX0PH+Qf5ghdI3dhIFuc6epOsYLOy164Ueo0RkUJ5zTu1ErnYYAGhbId9smy4bXfEX8ovokQg8MqeGhfUqA2q+0AJYuANJfwQawkf9uoEiUC72EbhmGKawIDAQABo4GiMIGfMB0GA1UdDgQWBBTkSDBlsQSEOtEqfVMEp8ThYMWZRTAMBgNVHRMBAf8EAjAAMB8GA1UdIwQYMBaAFPdDHK1itiL2tkVdoK6v8vJsSC5fMA4GA1UdDwEB/wQEAwIEsDA/BgNVHSUEODA2BggrBgEFBQcDAQYIKwYBBQUHAwIGCCsGAQUFBwMEBgorBgEEAYI3FAICBgorBgEEAYI3CgMMMA0GCSqGSIb3DQEBCwUAA4IBAQCGnuozL1NSEWOEUdqg6ws52PDWzz2BY59RN7f/YX7KnIH49xhWAP3xd8ZRzbPKBJEfFF7OVHSrzPLYjNCcfsbROHZxb41N+tltpakrGOAUSVgy+l7Wn4H8NrItYpBB/EXlBP1Xg7DYEFn+qFNVkO1TEAgQMqqPz1WDawnDvBbmXEKLTcImvQnMzx8BjP4oyY8isTSjXT4vqqJqtkd42RKItZ8HMm/X7tM0O8agfuboZuWVTk/gJZh3MsP7u1fHZ5YOhK86qAEAKfUSOR48gE8oQfcpLeO+J/I5KprzLa1bcGIE3EDVlfud7eM2rMU5UwJVAPsXmsF9OIReIx7J4w8M</clientCertificate>
-                    <clientKey>MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCSm+FM6l33H4Bs+g0PCtXCOgQkUeMKOxbufy3+GvWAhBYO73ANBy5N5r4aQVU8vWCFhzR1R5c4WcJdhDk9yhRWUJlrLwv5O4IwLp2xc7rocgilg2F77AT8qljjnSYP94iWLq8ADkZLf5FT3Si22MrD6eO4OIUyQ7YTHNgbQXqQj6uCAIPbdLAqPlnCWk94sa29kMcZuZ0tvYQ5rmFEGOnXjr0TWLPBuDoBfQ8f5B/mCF0jd2EgW5zp6k6xgs7LXrhR6jRGRQnnNO7USudhgAaFsh32ybLhtd8Rfyi+iRCDwyp4aF9SoDar7QAli4A0l/BBrCR/26gSJQLvYRuGYYprAgMBAAECggEAKoGJU9yLe8+lU3M4AAl7KkHZ25HmSpwRLPqwogC89xLUtmXTTeOsGCfzK/ePN/oMFwq5OduUy2CyypxAYFrLhK7/nCTaytrnBwMs8zsDkMsnGJ270MsAMyVMekmgtHZnImvMjy6UUOVehDsVx9WZDC4uuMWiUI1zJ51wRo64c1rTVKqJZ6u3MsOX2gMcFZJZTnJ394P04rnlTS2Jdb45NS6o4zPnGGnLbR2TtW0p3I0PnRbC2tbeP5p06QdgkP6LazAg5b8yGP/SfGmu1whvZLEJmunDH/npsTlQdwX7Z1bWaAOtvCirIByBFOgD6VEqX2cUQKPu8AOPZTvJpkB4gQKBgQDVuCEc5Oq+ZeqzrZYp3lTBZL92YrA0Y3o22dYO/+wuGJ4Md4YMpIR8KTbmNtf2ia95TBX5MBr+Eso4SjFI5Y0x3IL1u1kcivnjHMfyteSxlhcVkXh+4Ox3MWjmxnDl/o2mJM3981dZLiTp+Yu/Iq50EF8QbVlo4zGRJuNK8KFlQQKBgQCvnO25F2y8nAudKtXgQwnubK4Jl2PH2KDHAeZutDhjXwOvkrfMEPF06rR+C8hVsM9zMReMRFq+To3DmwmOTMOTPA4QxtI5DH+oNzuqtSDiNj0U7SIgx9l03/qkbNF3t1a3vc8yovsb3FcE0Cp6vI9JqUkKiYbK+s3IMCndwtDoqwKBgEkYrAKk7QDn/MktktGJIHXwzmdgQ6H3cCJ4iPUiZRYzB0N+UdPbJREOS5+bnGvPFbwn4NAUuvaxWIa+IXMsSAmIwSXoyQaxJdyeyGhj++8dRZHz6kGDDn2J4bYkoxKW6L2tkuLLqtFureN0nW5nH0HFI66Lp+vu4NIjedP0z07BAoGAEX4QL9+ldSQWBBHAPBZxZs5sh4gM6FsrqKcHzP8mnr9YHqT+qdUGOB8o22VRDzgNcevx7IbigxJQDKvkx8fds0zIGeO0DPqxvI/D4b0pCV9dtjforls5zeqBjN9J/iLFAIhnmyOg36WTBWe204L0wuGZ5PLN+moBFW+2u+Ar7wECgYEApP+PJPSHrYfNg56mdanPHvMUtdOQzssEuRtVjemoILDnXuD4ZDcjWJAbEMCAqJMYq97KOrfKBHwb5sXHE4lwIZdogyu/7sBOAVpr4pr8mhpbF98g3NbZlndXgCptlvj7fgG3Ekw5pk2rSSqfrly3dXFYH0VNSL5i70pA5QY0hoc=</clientKey>
+                    <serverCertificate>${DEMW_TLS_SERVER_CERT}</serverCertificate>
+                    <clientCertificate>${DEMW_TLS_CLIENT_CERT}</clientCertificate>
+                    <clientKey>${DEMW_TLS_CLIENT_KEY}</clientKey>
                 </sslKeys>
                 <terminalAuthService sslKeysId="default">
                     <url>https://dev.governikus-eid.de:9444/gov_dvca/ta-service</url>
@@ -40,7 +40,7 @@ cat<<EOF
                     <url>https://dev.governikus-eid.de:9444/gov_dvca/certDesc-service</url>
                 </dvcaCertDescriptionService>
             </PkiConnectorConfiguration>
-            <PaosReceiverURL>https://demw.eidastest.se/eidas-middleware/paosreceiver</PaosReceiverURL>
+            <PaosReceiverURL>https://${PUBLIC_HOSTNAME}/eidas-middleware/paosreceiver</PaosReceiverURL>
             <hoursRefreshCVCBeforeExpires>48</hoursRefreshCVCBeforeExpires>
         </EPAConnectorConfiguration>
     </ServiceProvider>
diff --git a/demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/eidasmiddleware.properties.sh b/demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/eidasmiddleware.properties.sh
index cdebad69..33d01e44 100755
--- a/demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/eidasmiddleware.properties.sh
+++ b/demw-1.qa.sveidas.se/overlay/opt/eidas-middleware/configuration/eidasmiddleware.properties.sh
@@ -5,7 +5,7 @@ CONTACT_PERSON_GIVENNAME=Sweden Connect
 CONTACT_PERSON_SURNAME=Operations
 CONTACT_PERSON_TEL=+46105742100
 COUNTRYCODE=SE
-ENTITYID_INT=se-de-middleware
+ENTITYID_INT=qa-se-de-middleware
 SERVER_URL=https://${PUBLIC_HOSTNAME}/eidas-middleware
 MIDDLEWARE_CRYPT_ALIAS=${MIDDLEWARE_CRYPT_ALIAS:-demw}
 MIDDLEWARE_CRYPT_KEY=/opt/eidas-middleware/configuration/eidasmw-crypto-keystore.jks
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 91fda8b2..68c7544c 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -256,6 +256,9 @@ class eidas_de_middleware($version="106-rs",$hostname='localhost') {
    $spring_datasource_password = safe_hiera('spring_datasource_password')
    $middleware_crypt_pin = safe_hiera('middleware_crypt_pin')
    $middleware_sign_pin = safe_hiera('middleware_sign_pin')
+   $demw_tls_client_key = safe_hiera('demw_tls_client_key')
+   $demw_tls_client_cert = safe_hiera('demw_tls_client_cert')
+   $demw_tls_server_cert = safe_hiera('demw_tls_server_cert')
    file {['/opt/eidas-middleware','/opt/eidas-middleware/configuration','/opt/eidas-middleware/database']: ensure => directory } ->
    sunet::snippets::secret_file {"/opt/eidas-middleware/configuration/eidasmw-signature-keystore.jks":
       hiera_key => 'eidasmw-signature-keystore',
@@ -279,6 +282,9 @@ class eidas_de_middleware($version="106-rs",$hostname='localhost') {
                    "EIDAS_SIGNER_DEFAULT_HASH_ALGORITHM=SHA256",
                    "PUBLIC_HOSTNAME=$_hostname",
                    "POSEIDAS_ADMIN_HASHED_PASSWORD=$poseidas_admin_hashed_password",
+                   "DEMW_TLS_CLIENT_KEY=$demw_tls_client_key",
+                   "DEMW_TLS_CLIENT_CERT=$demw_tls_client_cert",
+                   "DEMW_TLS_SERVER_CERT=$demw_tls_server_cert",
                    "SPRING_DATASOURCE_PASSWORD=$spring_datasource_password",
                    "MIDDLEWARE_CRYPT_PIN=$middleware_crypt_pin",
                    "MIDDLEWARE_SIGN_PIN=$middleware_sign_pin"]