diff --git a/demw-1.test.sveidas.se/overlay/etc/hiera/data/local.eyaml b/demw-1.test.sveidas.se/overlay/etc/hiera/data/local.eyaml
index 50fcd7bb..165684e7 100644
--- a/demw-1.test.sveidas.se/overlay/etc/hiera/data/local.eyaml
+++ b/demw-1.test.sveidas.se/overlay/etc/hiera/data/local.eyaml
@@ -1,6 +1,3 @@
 ---
-
-poseidas_admin_hashed_password: ENC[PKCS7,MIIC2gYJKoZIhvcNAQcDoIICyzCCAscCAQAxggKCMIICfgIBADBmME4xCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxHzAdBgNVBAMMFmRlbXctMS50ZXN0LnN2ZWlkYXMuc2UCFHodUDtFtoj6tT1rdF5qt0AL2b8lMA0GCSqGSIb3DQEBAQUABIICAGhvfiDQ4BWe2h/uUy5N4jWsZwgDiKF0EflxdGq2s+xF2eMt6z3aInfbYaP5Gne0cUMVmsytG73RDUvumhlXcJboHRwTew+pOwDNpJXZK1FDe8QHWwyeWy0SkFHqmQ/sIwtQxP0hUdi0psvxF2G3pWhVign9fqTxOeeifnfKHpPcGXNJd//IKo09Ev4Lw6PhSgIB1mx2cHlmfRlZLUCai1eF5FcAKJpEeg6l+MlknTPLjcSw9rjkCN//BWdUE7ugB72C5/ENvW2XXTNvLxO92ZztusuFANZ7z4tiaAaVZ/vAeLO4JWXRxhU65AwfEvKtzqN5mvG/bJ7dvJb1TVFCEZQGEaF2uAuuFEYXihQM171VkI5eRN/v74Eec4mY1R7Q+uYZ8CZGq4cFgw3myShNIQv9YxpJ8vBFXnWT8SWLzHcEVlpyrfjwFXkSxqllB5x1UBwX1FacvmQ0cEBKe4q5otxf+kNfen8afyGk748W3J2eJfGCmGHLyyR0RX9P9zm9jFzqS3UeWhkKO0g2WczQsz+Wv1Gd0vySey9RPEnvcKL/D9Poz++2DWfClcHyvQOyYWEqLeKGKxcgx9PykBsQ0AtU0j9jfj6K3aSg8wWJXugrHAIk44aB2nIIXgD4lsypt/AkUDxNH/KxxG+yxKcZmCzQ0m+jabqmFUkfowvy+18nMDwGCSqGSIb3DQEHATAdBglghkgBZQMEASoEEH5ZC2/0iWOXfABPOz9O9IyAEAoSnHIWRAQ6DDbyEuzwxMA=]
 spring_datasource_password: ENC[PKCS7,MIIC6gYJKoZIhvcNAQcDoIIC2zCCAtcCAQAxggKCMIICfgIBADBmME4xCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxHzAdBgNVBAMMFmRlbXctMS50ZXN0LnN2ZWlkYXMuc2UCFHodUDtFtoj6tT1rdF5qt0AL2b8lMA0GCSqGSIb3DQEBAQUABIICAFO4tBHksfw6eNh3X1gDfS5V0Pm7oQCGIHYV0A+r7Pp+3W/HiY7k83tUfpwkgtQMLGfRj4YsRuvf5s4bD2OFjd2EUsFxpTpH1W83BXcdviPyFsbabembaUVOxkxuSawR6oyKfv3oXNj8tVUSEgIpyxSR5+nZUTf5vgym7THB25qzRRwN23DwgWtrnhu34YWjwNAFHDc15KIB6mlfc0a4wZglh/Xwk4JXo+HvDYPo9qme124ho5HKVFqlu7RhLzwpLCHICS+FEW2XrWYEuqOeua2/D1noBfaMYp3bkD4OE1J2GfxBd0JtQctgreRy6yIyILDsJ17uEEgMmU77OTqvj1ffBE6/QJZdI8u1+jYF2sriZLbtg3xIKs0t3EFT2Z0WKij5/B03T0RoS5b7Dj7f46v808MVRfR59z80o+sBaqKbdVpBTg2KDW39jkk+F/jt9bJexp9WUd3i2N/TDGBaVTEecTJe20zvEfi596hEMTFK3ao9EXmDDB0rkyIkpunP+iC7kgVF679rcXLmpTUkMQoi0Vuv8dBMRiitqMcRS8zWce7wLU7C1EL50p1iI9nkZxdHCz+XW+4EIPLQi+uWHldy+UOk10OxGt32kIqpn/oo74ZqNb0N7Y5jPUGraYm99xw3vCUYvJfC/YpLRwY/mKsXMTwPixhnW5mm393uhOCsMEwGCSqGSIb3DQEHATAdBglghkgBZQMEASoEEC7IRNpzRKavU8K3Lx9Pb02AIDf50XJHKtueH17mXCzE9cjE/1nO41O2wMFE5fVqdnRN]
 pkcs11_pin: ENC[PKCS7,MIIC6gYJKoZIhvcNAQcDoIIC2zCCAtcCAQAxggKCMIICfgIBADBmME4xCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxHzAdBgNVBAMMFmRlbXctMS50ZXN0LnN2ZWlkYXMuc2UCFHodUDtFtoj6tT1rdF5qt0AL2b8lMA0GCSqGSIb3DQEBAQUABIICAFV//Dm7LFbTSN9OBB/AHfFnQqrdRtjmbhAC+k1hjDB6ecS4abwBPRgymYUPHpZY/2kwOel8jBlS/a2mzyMo4CIzew+/9BQozoSe9b9PEoA0/PM35mOu8zKmsofAGrxf+LK/9DodXiiph1Z9GrjVUy9tLqtpJ2On0OzFjIAhmyP7U1KBLdP/invHZDYcnuVvzLAgoJIbwkO+okTdyieoqKXtz5n/Tp7efMjfqLcBBX0XZ97zRaTfs1csnIoe4jd1sE0uX4CkVY6B3sG/J7RdsI375oZkm55nZFxGZA87kyoiJs5CAOImKoksIGJ3YY03les2urVycW/UZod+vm+QOSoSxWNX4QFkewOhTaOi+bVWSuMUnNfi7V9t2HkAdrO44NgIQktDQUUxM8IWgoOgGOpTMSklLMA+Eoc8vIVeCGm3OCTn78gUoxxZ2CXDNpthjcsGfr8hkrfIco+9HRL/JdQSGPadREcfVojLpfg3pez2Mi9AA7f1qN09A7tyR1RS89kerNvZf7sEjIlDta4II8Pgh1WK2jyzrw8o0hgBgdfbKBA824rVeloUJulvwduzCGDHteXqM5usqu+asaNDiQ7IqSnj3hQBsDBLOCJ4Ppzko6DMxcaH+LVmMhmaLYzlcNOCJvwNzoEXcdQT4nNaVlNcPft/v5+wxzGJYqs3nlnNMEwGCSqGSIb3DQEHATAdBglghkgBZQMEASoEEL4rJqCeM9lT/zQHdW+NN4iAIGFLy3aEUBlzSRna/dGXqkiTX5xLf7/zy7L+wiGNxcrT]
-demw_tls_client_key: ENC[PKCS7,MIIC2gYJKoZIhvcNAQcDoIICyzCCAscCAQAxggKCMIICfgIBADBmME4xCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxHzAdBgNVBAMMFmRlbXctMS50ZXN0LnN2ZWlkYXMuc2UCFHodUDtFtoj6tT1rdF5qt0AL2b8lMA0GCSqGSIb3DQEBAQUABIICAFU8gTcSUATcNysDUaTp7B3FK4sNxTndAhML4/jPMD2XIwka7XVwCBXAN69hlNxScNI1nhcmpVgsu1RuvlEzALuwS5+cZKDlVTs543mi+B9snVhBJf4SqEEspUwCaiMGoje45o2vy2ELLppSTQ+mWxEgG60/heHiV0E3Chvk1T+e1lC70qufnNo77KQxFOk6DGSt4VmaVKSBR5ihzs98xSkxm8RP9awLprjsPNOS69O2cKskM4sL5L2vSInPvUDm1v4AEq/W13KXQNnDpmEl/yapwXXrK6xEehkd+9Mk3y1w/AOohHvNDmR3DiFszL5wmmgf3kmOa1oYcpPYBi+g/CN+Ulyi9YMHeX0y//Kcs+ciZX7B7o7LaUpB9jWRfo81S+hlQHdFXEzjtLtMH1/t47zMaHRyDaGfpX654ZZrWxEkX2C7TqbAEiJvsbsjoPkxVGTpiF4MF4gN5X1GTayDIdxLWs/86RO48Dv0nhQe2Vdj3sn2PXpeAP7mt0MkrqsetCebReIHJWsg9XofNm+mp8ECcSTcELpvHkVEKlvieBVwxSQUumV2ARS7V0C3GO0SNLX6nqo0m3P6RDbtrgmFtVB5G4hNrcK1JwewDYcwIe2aSIsRnHFYcOg/ZssLLwHZenkP3SxuL8ckeMVGPPONLf0/vQkHBp9a/jTmX01YisjNMDwGCSqGSIb3DQEHATAdBglghkgBZQMEASoEEL5rfiAznpUpTtYSHDFW9uyAEF+SLNDxf4HyjmPAFVgt0TQ=]
diff --git a/demw-1.test.sveidas.se/overlay/etc/hiera/data/local.yaml b/demw-1.test.sveidas.se/overlay/etc/hiera/data/local.yaml
deleted file mode 100644
index adec80c3..00000000
--- a/demw-1.test.sveidas.se/overlay/etc/hiera/data/local.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-demw_tls_client_cert: xxx
diff --git a/demw-1.test.sveidas.se/overlay/opt/eidas-middleware/configuration/POSeIDAS.xml.sh b/demw-1.test.sveidas.se/overlay/opt/eidas-middleware/configuration/POSeIDAS.xml.sh
deleted file mode 100644
index 7a155058..00000000
--- a/demw-1.test.sveidas.se/overlay/opt/eidas-middleware/configuration/POSeIDAS.xml.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-cat<<EOF
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<CoreConfiguration
-    xmlns="http:/www.bos_bremen.de/2009/06/eID-Server-CoreConfig">
-    <ServerUrl>https://${PUBLIC_HOSTNAME}:443/eidas-middleware</ServerUrl>
-    <sessionManagerUsesDatabase>true</sessionManagerUsesDatabase>
-    <sessionMaxPendingRequests>500</sessionMaxPendingRequests>
-    <certificateWarningMargin>200</certificateWarningMargin>
-    <TimerConfiguration>
-        <certRenewal length="2" unit="11" />
-        <blacklistRenewal length="2" unit="11" />
-        <masterAndDefectListRenewal length="2" unit="11" />
-    </TimerConfiguration>
-    <ServiceProvider entityID="se-de-middleware" enabled="true">
-        <EPAConnectorConfiguration updateCVC="true">
-            <CVCRefID>se-de-middleware</CVCRefID>
-            <PkiConnectorConfiguration>
-                <blackListTrustAnchor>MIIFwzCCBKugAwIBAgIDD+TCMA0GCSqGSIb3DQEBCwUAMFMxCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxELVRydXN0IEdtYkgxLTArBgNVBAMMJEQtVFJVU1QgTGltaXRlZCBCYXNpYyBSb290IENBIDEgMjAxNTAeFw0xODA0MTkxMzAyMjZaFw0zMDExMDQwNzM1NTFaMFQxCzAJBgNVBAYTAkRFMRUwEwYDVQQKEwxELVRydXN0IEdtYkgxLjAsBgNVBAMTJUQtVFJVU1QgTGltaXRlZCBCYXNpYyBFQUMgQ0EgMS0xIDIwMTgwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDB8WLI+HxLRlAQCcpRqQjwU6slek1H4USttrsOgkDdeqj5MRPpOxcWuoqt/13Yt93stTqRd6xjz6eoG1MMEQuaELW6rLPiTmHe1hlcLVgI/VVwo3cfzng4SSNJhlFgYKaKKMVbz9vdmXYMqyzjerTvLBpHzab0o8TRmSck+2Jxb55KEMOGOiOaetQlQ2bMaNxfwU0A0wZzp+iCpFbgcXByS1mlZ+lf3Vv8TVbRvbyvuEwxbgO4LsbtfDLbYWcNU5CsTq7XMIGaIicPQ9X7uolMyk5+jH/DnBW0Q3v/0AZWTlG2DML6bCbyaVdvG+soE4bbNQsUrIP0mFfF2bn3SUZVAgMBAAGjggKdMIICmTAfBgNVHSMEGDAWgBQlSUX5fGYWq5kTw3rWRXJpOqsDmjCCATIGCCsGAQUFBwEBBIIBJDCCASAwQAYIKwYBBQUHMAGGNGh0dHA6Ly9saW1pdGVkLWJhc2ljLXJvb3QtY2EtMS0yMDE1Lm9jc3AuZC10cnVzdC5uZXQwUwYIKwYBBQUHMAKGR2h0dHA6Ly93d3cuZC10cnVzdC5uZXQvY2dpLWJpbi9ELVRSVVNUX0xpbWl0ZWRfQmFzaWNfUm9vdF9DQV8xXzIwMTUuY3J0MIGGBggrBgEFBQcwAoZ6bGRhcDovL2RpcmVjdG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwTGltaXRlZCUyMEJhc2ljJTIwUm9vdCUyMENBJTIwMSUyMDIwMTUsTz1ELVRydXN0JTIwR21iSCxDPURFP2NBQ2VydGlmaWNhdGU/YmFzZT8wGAYDVR0gBBEwDzANBgsrBgEEAaU0AoN0ATCB4gYDVR0fBIHaMIHXMIGJoIGGoIGDhoGAbGRhcDovL2RpcmVjdG9yeS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwTGltaXRlZCUyMEJhc2ljJTIwUm9vdCUyMENBJTIwMSUyMDIwMTUsTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3QwSaBHoEWGQ2h0dHA6Ly9jcmwuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3RfbGltaXRlZF9iYXNpY19yb290X2NhXzFfMjAxNS5jcmwwHQYDVR0OBBYEFLMMWK3/AmFZeIBP77yuRvKGG79pMA4GA1UdDwEB/wQEAwIBBjASBgNVHRMBAf8ECDAGAQH/AgEAMA0GCSqGSIb3DQEBCwUAA4IBAQAIVJmvQUmQzKtHu5J06SpEdhlkZwHn8EA8U0Ieh5mgpxif14EwIf43ChVq2SpSKZErtQWewE+drUH2r6FvT+/3OW+TYr1jdejQFXcGXABKbJDqFfBIkbAr6E+Dy90aur656nZv+lV/leHL6pCPilcSzTTrdyNzL86AQrifcCO7GPO0tVjkUCFTEByGqWkOPtu0Xr+04bxdtUIWrpBHQENwEx67B0tS60c5v/cdhi9EedGHvJy5lXtw0R8KKR8u/WEbwmI72EIcrgG+/jF/oMR59x2bTv6hVGT9KkddKWot0oBNGkMJrLAJboq5zzHYxXEJFpjhOgkS7THQHGcxPJn8</blackListTrustAnchor>
-		<masterListTrustAnchor>MIIFKjCCBI+gAwIBAgICBE0wCgYIKoZIzj0EAwQwQTELMAkGA1UEBhMCREUxDTALBgNVBAoMBGJ1bmQxDDAKBgNVBAsMA2JzaTEVMBMGA1UEAwwMY3NjYS1nZXJtYW55MB4XDTE5MDUyMDA5MjYyMloXDTMzMDIyMDIzNTk1OVowQTELMAkGA1UEBhMCREUxDTALBgNVBAoMBGJ1bmQxDDAKBgNVBAsMA2JzaTEVMBMGA1UEAwwMY3NjYS1nZXJtYW55MIICODCCAa8GByqGSM49AgEwggGiAgEBMEwGByqGSM49AQECQQCq3Z242+nEiz/U5q4zyfwHyzCNs7PJ0g7WY5zKcDMIcX1NmwCbxmhCrs2hKuajgOYogf8vLYLGhSiqYFZYOkjzMIGEBEB4MKMxi2A7ieIycUWsI0zFlMvdjT35FhCoNEHK6phjvC3tXVqoJTqhCi7xyYuayLV/ERenK/LHuefBrE13/JTKBEA9+RYQqDRByuqYY7wt7V1aqCU6oQou8cmLmsi1fxEXpyvyx7nnwaxNd/yUytwIPmeYQFC3Xrrl3SgJvWOAFvcjBIGBBIGu5L3YLtlkWiEyLpxMapOF7Z9wtdkWwbQ7Yu700AmO/zsfeOLQ1I1Q0Wh7k7l9X3xtUEdAal5oizUiCby5+CJ93jhdVmMy7MDqv6nPeCL98gn3ACSlexqgAMVbiB+BEbLc3klKX0heW8pL2IonY67RyisvqPBUBnjNHg862AiSAkEAqt2duNvpxIs/1OauM8n8B8swjbOzydIO1mOcynAzCHBVPlxBTKkmGUGGYRl/rBBHHbHTgQhd2t21h5aCnKkAaQIBAQOBggAEEERozJeK4nstSM5WcswLo7XmgwufavFGedmYQpZdonhC5trUBNLYkNNW69vl5va9oTRr1fU95eJ/nKJQy5I3cRRuw1hOp+rSUUfk2V9ACscNpIMKLTVp9kUOKrLObvnjaDes+4eNV3WiCv6MiD77pMmSx6ek9IPqd7KxU5/iW42jggGUMIIBkDAdBgNVHQ4EFgQUdBpErUvXtvzVuu7xHoJ+WKWYHCQwDgYDVR0PAQH/BAQDAgEGMCsGA1UdEAQkMCKADzIwMTkwNTIwMDkyNjIyWoEPMjAyMjA3MjAyMzU5NTlaMBYGA1UdIAQPMA0wCwYJBAB/AAcDAQEBMFEGA1UdEQRKMEiBGGNzY2EtZ2VybWFueUBic2kuYnVuZC5kZYYcaHR0cHM6Ly93d3cuYnNpLmJ1bmQuZGUvY3NjYaQOMAwxCjAIBgNVBAcMAUQwUQYDVR0SBEowSIEYY3NjYS1nZXJtYW55QGJzaS5idW5kLmRlhhxodHRwczovL3d3dy5ic2kuYnVuZC5kZS9jc2NhpA4wDDEKMAgGA1UEBwwBRDASBgNVHRMBAf8ECDAGAQH/AgEAMDAGA1UdHwQpMCcwJaAjoCGGH2h0dHA6Ly93d3cuYnNpLmJ1bmQuZGUvY3NjYV9jcmwwDQYHZ4EIAQEGAQQCBQAwHwYDVR0jBBgwFoAUdBpErUvXtvzVuu7xHoJ+WKWYHCQwCgYIKoZIzj0EAwQDgYgAMIGEAkA4qqxpicREnfeRLiNJBGAmOmRmT2JyNx76ttqogtx31bS6ZOGF+08akTb6J2gdXTuTfQ05buVwKjA8HMI0J463AkB+iwO2+J/NaYUdr014wTu5ZHcbSMA2QpaSl2v+Gzp0+QpeP2a/2gvGZoiVpfTT4mfEmtcCN5QwRWmXpMyB2IsO</masterListTrustAnchor>
-		<defectListTrustAnchor>MIIFKjCCBI+gAwIBAgICBE0wCgYIKoZIzj0EAwQwQTELMAkGA1UEBhMCREUxDTALBgNVBAoMBGJ1bmQxDDAKBgNVBAsMA2JzaTEVMBMGA1UEAwwMY3NjYS1nZXJtYW55MB4XDTE5MDUyMDA5MjYyMloXDTMzMDIyMDIzNTk1OVowQTELMAkGA1UEBhMCREUxDTALBgNVBAoMBGJ1bmQxDDAKBgNVBAsMA2JzaTEVMBMGA1UEAwwMY3NjYS1nZXJtYW55MIICODCCAa8GByqGSM49AgEwggGiAgEBMEwGByqGSM49AQECQQCq3Z242+nEiz/U5q4zyfwHyzCNs7PJ0g7WY5zKcDMIcX1NmwCbxmhCrs2hKuajgOYogf8vLYLGhSiqYFZYOkjzMIGEBEB4MKMxi2A7ieIycUWsI0zFlMvdjT35FhCoNEHK6phjvC3tXVqoJTqhCi7xyYuayLV/ERenK/LHuefBrE13/JTKBEA9+RYQqDRByuqYY7wt7V1aqCU6oQou8cmLmsi1fxEXpyvyx7nnwaxNd/yUytwIPmeYQFC3Xrrl3SgJvWOAFvcjBIGBBIGu5L3YLtlkWiEyLpxMapOF7Z9wtdkWwbQ7Yu700AmO/zsfeOLQ1I1Q0Wh7k7l9X3xtUEdAal5oizUiCby5+CJ93jhdVmMy7MDqv6nPeCL98gn3ACSlexqgAMVbiB+BEbLc3klKX0heW8pL2IonY67RyisvqPBUBnjNHg862AiSAkEAqt2duNvpxIs/1OauM8n8B8swjbOzydIO1mOcynAzCHBVPlxBTKkmGUGGYRl/rBBHHbHTgQhd2t21h5aCnKkAaQIBAQOBggAEEERozJeK4nstSM5WcswLo7XmgwufavFGedmYQpZdonhC5trUBNLYkNNW69vl5va9oTRr1fU95eJ/nKJQy5I3cRRuw1hOp+rSUUfk2V9ACscNpIMKLTVp9kUOKrLObvnjaDes+4eNV3WiCv6MiD77pMmSx6ek9IPqd7KxU5/iW42jggGUMIIBkDAdBgNVHQ4EFgQUdBpErUvXtvzVuu7xHoJ+WKWYHCQwDgYDVR0PAQH/BAQDAgEGMCsGA1UdEAQkMCKADzIwMTkwNTIwMDkyNjIyWoEPMjAyMjA3MjAyMzU5NTlaMBYGA1UdIAQPMA0wCwYJBAB/AAcDAQEBMFEGA1UdEQRKMEiBGGNzY2EtZ2VybWFueUBic2kuYnVuZC5kZYYcaHR0cHM6Ly93d3cuYnNpLmJ1bmQuZGUvY3NjYaQOMAwxCjAIBgNVBAcMAUQwUQYDVR0SBEowSIEYY3NjYS1nZXJtYW55QGJzaS5idW5kLmRlhhxodHRwczovL3d3dy5ic2kuYnVuZC5kZS9jc2NhpA4wDDEKMAgGA1UEBwwBRDASBgNVHRMBAf8ECDAGAQH/AgEAMDAGA1UdHwQpMCcwJaAjoCGGH2h0dHA6Ly93d3cuYnNpLmJ1bmQuZGUvY3NjYV9jcmwwDQYHZ4EIAQEGAQQCBQAwHwYDVR0jBBgwFoAUdBpErUvXtvzVuu7xHoJ+WKWYHCQwCgYIKoZIzj0EAwQDgYgAMIGEAkA4qqxpicREnfeRLiNJBGAmOmRmT2JyNx76ttqogtx31bS6ZOGF+08akTb6J2gdXTuTfQ05buVwKjA8HMI0J463AkB+iwO2+J/NaYUdr014wTu5ZHcbSMA2QpaSl2v+Gzp0+QpeP2a/2gvGZoiVpfTT4mfEmtcCN5QwRWmXpMyB2IsO</defectListTrustAnchor>
-                <policyImplementationId>govDvca</policyImplementationId>
-                <sslKeys id="d-trust">
-                    <serverCertificate>
-                       MIIFlTCCBH2gAwIBAgIQa9qcxVoIYXKTCKJmuZqX4jANBgkqhkiG9w0BAQsFADBUMQswCQYDVQQGEwJERTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMS4wLAYDVQQDEyVELVRSVVNUIExpbWl0ZWQgQmFzaWMgRUFDIENBIDEtMSAyMDE4MB4XDTIzMDMwNzE0MDYzOVoXDTI3MDMwNzE0MDYzOVowUzELMAkGA1UEBhMCREUxFDASBgNVBAoTC0VBQyBTeXN0ZW1lMR0wGwYDVQQDExRiZXJjYS1wMS5kLXRydXN0Lm5ldDEPMA0GA1UECBMGQmVybGluMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsuMu+OZv6usJeIEiO4SQhTtv8j7bfaguqfZkZ1wI0su6JJe/WSMYp4vjm6oswNEV8bwUL6G6hZd4spqVXX7Jw21Xi+HZg4RYOoWDd58zLIRNYbDVa0pRLbgyhG9xWQCXdsl6zggAKNdxhRhN/WrXQJ2bTDH4gXbfsOUcIq6FJDqyhAQ3BoTa0tEcYmaqIZefPRNYwt4/khsZuEsEOWyc0usA6x4Q7/CnkiHYE8aiXFDA/N0n/WuwKhbEnwZms4qWhVQ63nF8gVzKdYT9LtkLjX9DDFVm3sZ1nkuVwRFNJcUTpg42GtfwrcXOJKP1o8n6AAcTvjdcpQKnO1xQCEopieQk9aXsqaSkBbbu111WrN7nzUEEe4qwcaFZiXndvsSz6UShHcNXJP7mCAQl9SeE1go0hZtj+rxq2s9HqKd467vzM0UGIxuOZ22jI5VsNFdqw1/6dG2zG79kHPYApWpt+bJVaW651CIywIC4xeS2Vm1c5qbom+pYDjKZcDYky1RYvMFRzPgocxVR8VltzfmFEmCC5QDalM6ssnsdRTtdoidQ7l+2jUz6rOw72RycDeZ0afmdCa6kLFlAuDgQWSHMx2EF+NM2y1QesYEXYALQW26t1tU0inw8zY0gGXqzjzaBgUPWp4tM78Ud0ILsTCecebF1E4W3N2ENEI1G89Tw4wECAwEAAaOCAWIwggFeMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1UdDgQWBBS0NmHsZtoT1joR7mh9Ibb9qqPnbDAWBgNVHSAEDzANMAsGCSqCFABQB4N0CjAfBgNVHSMEGDAWgBSzDFit/wJhWXiAT++8rkbyhhu/aTAOBgNVHQ8BAf8EBAMCBaAwgd4GA1UdHwSB1jCB0zCB0KCBzaCByoaBgWxkYXA6Ly9kaXJlY3RvcnkuZC10cnVzdC5uZXQvQ049RC1UUlVTVCUyMExpbWl0ZWQlMjBCYXNpYyUyMEVBQyUyMENBJTIwMS0xJTIwMjAxOCxPPUQtVHJ1c3QlMjBHbWJILEM9REU/Y2VydGlmaWNhdGVyZXZvY2F0aW9ubGlzdIZEaHR0cDovL2NybC5kLXRydXN0Lm5ldC9jcmwvZC10cnVzdF9saW1pdGVkX2Jhc2ljX2VhY19jYV8xLTFfMjAxOC5jcmwwDQYJKoZIhvcNAQELBQADggEBAE2HFqO27Pj/gnXbvFZWrok1NyQzoXHfI3iIhlzyMu8kYeZSHomHN12dSmz0uwGS/r0+hcfPTK1SzQh1Ens/QhRPxqcJHQNNOs/AHheC1l2x4ZvQ225seusix7qcDHiY0zKynLMAEaAxEebcSLoWSIFOuZJA2tqpU15g5MLjmeEDiS3myROaMAQltFlF13Q5SqkXxvwlPJSuAZpYU1BmpQSLS2xgVPcnpHhffbHaTMSF6UojxS9SwWr+ISliINZIP30LKbRRMcSiFkT1/qhTkCgM3a7h4lq9TGJJt/LZsz1VeyZwE4kcu07FO6tvjV091t5kGkx/QEwQjLXhnSRvmF8=
-                    </serverCertificate>
-                    <clientCertificate>${DEMW_TLS_CLIENT_CERT}</clientCertificate>
-                    <clientKey>${DEMW_TLS_CLIENT_KEY}</clientKey>
-                </sslKeys>
-                <terminalAuthService sslKeysId="d-trust">
-                    <url>https://berca-p1.d-trust.net/ps/dvca-at/v1_1</url>
-                </terminalAuthService>
-                <restrictedIdService sslKeysId="d-trust">
-                    <url>https://berca-p1.d-trust.net/ps/dvsd_v2/v1_1</url>
-                </restrictedIdService>
-                <passiveAuthService sslKeysId="d-trust">
-                    <url>https://berca-p1.d-trust.net/ps/scs</url>
-                </passiveAuthService>
-                <dvcaCertDescriptionService sslKeysId="d-trust">
-                    <url>https://berca-p1.d-trust.net/ps/dvca-at-cert-desc</url>
-                </dvcaCertDescriptionService>
-            </PkiConnectorConfiguration>
-            <PaosReceiverURL>https://${PUBLIC_HOSTNAME}:443/eidas-middleware/paosreceiver</PaosReceiverURL>
-            <hoursRefreshCVCBeforeExpires>70</hoursRefreshCVCBeforeExpires>
-        </EPAConnectorConfiguration>
-    </ServiceProvider>
-</CoreConfiguration>
-EOF
diff --git a/demw-1.test.sveidas.se/overlay/opt/eidas-middleware/configuration/eidasmiddleware.properties.sh b/demw-1.test.sveidas.se/overlay/opt/eidas-middleware/configuration/eidasmiddleware.properties.sh
deleted file mode 100644
index 8b6d3c45..00000000
--- a/demw-1.test.sveidas.se/overlay/opt/eidas-middleware/configuration/eidasmiddleware.properties.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-cat<<EOF
-#Wed Jul 11 09:28:06 GMT 2018
-CONTACT_PERSON_COMPANY=Sweden Connect
-CONTACT_PERSON_EMAIL=operations@swedenconnect.se
-CONTACT_PERSON_GIVENNAME=Sweden Connect
-CONTACT_PERSON_SURNAME=Operations
-CONTACT_PERSON_TEL=+46105742100
-COUNTRYCODE=SE
-ENTITYID_INT=se-de-middleware
-SERVER_URL=https://${PUBLIC_HOSTNAME}
-ORGANIZATION_DISPLAY_NAME=Sweden Connect
-ORGANIZATION_LANG=sv
-ORGANIZATION_NAME=Sweden Connect
-ORGANIZATION_URL=https\://swedenconnect.se
-SERVICE_PROVIDER_CONFIG_FOLDER=/opt/eidas-middleware/configuration/serviceprovider-metadata
-SERVICE_PROVIDER_METADATA_SIGNATURE_CERT=/opt/eidas-middleware/configuration/credentials/metadata-signature-certificate.crt
-
-#metadata validity
-#METADATA_VALIDITY=2063-04-30
-EOF
diff --git a/global/overlay/etc/puppet/manifests/cosmos-site.pp b/global/overlay/etc/puppet/manifests/cosmos-site.pp
index 3c99f62b..3338010b 100644
--- a/global/overlay/etc/puppet/manifests/cosmos-site.pp
+++ b/global/overlay/etc/puppet/manifests/cosmos-site.pp
@@ -400,7 +400,6 @@ class eidas_de_middleware_hsm($version="110-fixes-sc-p11",$hostname='localhost')
 class eidas_de_middleware_hsm_test($version="110-fixes-sc-p11",$hostname='localhost') {
    $_version = safe_hiera('eidas_demw_version',$version)
    $_hostname = safe_hiera('eidas_demw_hostname',$hostname)
-   $poseidas_admin_hashed_password = safe_hiera('poseidas_admin_hashed_password')
    $spring_datasource_password = safe_hiera('spring_datasource_password')
    $pkcs11_pin = safe_hiera('pkcs11_pin')
    $demw_tls_client_key = safe_hiera('demw_tls_client_key')
@@ -422,14 +421,8 @@ class eidas_de_middleware_hsm_test($version="110-fixes-sc-p11",$hostname='localh
                    '/etc/Chrystoki.conf.d:/etc/Chrystoki.conf.d',
                    '/etc/ssl:/etc/ssl'],
       env      => ["CERTNAME=${::fqdn}_infra",
-                   "EIDAS_SIGNER_DEFAULT_HASH_ALGORITHM=SHA256",
-                   "PUBLIC_HOSTNAME=$_hostname",
                    "PKCS11_PIN=$pkcs11_pin",
                    "PKCS11_CONFIG_LOCATION=/opt/eidas-middleware/configuration/hsm/pkcs11.properties",
-                   "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",
                    'JAVA_OPTS="-DformatMsgNoLookups=true -Dlog4j2.formatMsgNoLookups=true"',
                    "SPRING_DATASOURCE_PASSWORD=$spring_datasource_password"],
       extra_parameters => ["--log-driver=syslog --cpuset-cpus=0-3"]