diff --git a/eidas-connector-common/overlay/etc/eidas-connector/credentials/connector.crt b/eidas-connector-common/overlay/etc/eidas-connector/credentials/connector.crt
new file mode 100644
index 00000000..08b347fd
--- /dev/null
+++ b/eidas-connector-common/overlay/etc/eidas-connector/credentials/connector.crt
@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFJjCCAw4CCQDLXkUXogE6DTANBgkqhkiG9w0BAQsFADBVMQswCQYDVQQGEwJT
+RTEnMCUGA1UECgweU3dlZGlzaCBFLWlkZW50aWZpY2F0aW9uIEJvYXJkMR0wGwYD
+VQQDDBRldW5vZGUucWEuc3ZlaWRhcy5zZTAeFw0xNzEyMTkxMjIwMjVaFw0yNzEy
+MTcxMjIwMjVaMFUxCzAJBgNVBAYTAlNFMScwJQYDVQQKDB5Td2VkaXNoIEUtaWRl
+bnRpZmljYXRpb24gQm9hcmQxHTAbBgNVBAMMFGV1bm9kZS5xYS5zdmVpZGFzLnNl
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAk7eWFBC69lZpjj5MVpq0
+4mXy/5CvOLft9tsNJcwLH0i7VocyzSpnJE3WmtMgQlnKxcAAfagG4j/LI/h5AcK2
+IF3wmL5Wb2sfd3uQQefhS7JWrGxc9RZmG0JE2ivO4vyLxgoc0h0HgpMHB+gafjM1
+TKaXXKksofPV+1Op1Pep914fpoT34h3gnje+LFWNj2kbqwUe/1PEeELgNDo4Fe0T
+bZ+zqmv3IavTxJ1vogR3WyxJuoTPpq9q+ZhW3JCS39uAiMYMFyecbb7eqa2FocXk
+tOIs8KS6pgpG6qU0uG2vlZmyJeO0O+WEfLAyJbcc0xKnRyvljws55AEYLzxPnpXT
+9Ha92+sOOjhMNpMIXKx7OirxqAzGm/6S6WNrJgaeRVczjGm+8v0s9MarEKNdkl1Z
+P6YXy2FKbvbiKtNOWh72aU4OvfVnK3ByqTS6AeRHO8P1PPbeWAfLeq1pVHMRp+Ix
+VFeJnHn4tVzht6ALEOCR/henPCvYuZT1jfNfO8nz1pLlIolIXo3nGn2Gsvf0bZoz
+r3e86x4Gu+zZCyPR3ANog8sB+cQbB401DFmC0W7zZz1XzIem5FQ2/0NtlkOIRgQj
+xfZ1pwaAPT6npJKeJMzPP/wpeyAkG37+47Boz4NIDdHmyWghgNbAi24BwYDOIolO
+3q/Aro2daayvKNSxRw+0ozkCAwEAATANBgkqhkiG9w0BAQsFAAOCAgEAI8t7Ymcp
+YfSg4XVEBmxhVLMHTR+hpyPcDRTDEO64XxBSlv5obSjrKlyiRZrsJO4RYYCnmE9f
+WQjwf1/3SFTaABYtdCwCWcIK6WAcDPODrB8yZ1DRpp/29c4YOA7KGJIYz/c4AM7n
+XhDmZgjzKjMFD06RE5oAEsBq3kma3cVG+EYQeAS6aystPRUqN02z9PqjwGdxOjkH
+Eedx7iGo+p7rcSqlNhExBmFAdUz2/vYfVg1wcYzoJhGCVLbSNbfC79p2EnRJLwN4
+io992aJfG22tnQ5IObvc5kpzK8jcO4gg/+yCuqxlOavipM8u28xRD0Lmo6AZngME
+AJC6E9Ei8dw73F5p5A7R5ERc0q5NCNf/ZgdEjRlU0TODoT5V3bpcEii9bExu9Rr4
+WvNKER30ZHW52xaMBcamyarRztP5PYFql8tQu6WfKSepx0fbVvqI8rkCZYgHrc6S
+BLJCX1c4rk2MWQk84yY+F95kGdtgv5ps5WMCNuVhbxtr/ZtSrTMjpdRJHzKDBW89
+BLUHSNwE9qc+VnhsUKcmvdCZVVNj0Su+6rAitnKXM7dU+l92W8LdL8tVDS9bVga3
+FtlcAtrVuc+sMGhdn157sYC4+7mZt1YgumVMpK5Yzr5NDoveH9m/zq8oJeTIwpdM
+/2dt5QvFc1zkbOrQw2q9B48opzvoJaU7ji8=
+-----END CERTIFICATE-----
diff --git a/eidas-connector-common/overlay/etc/eidas-connector/credentials/idp/idp-encryption.crt b/eidas-connector-common/overlay/etc/eidas-connector/credentials/idp/idp-encryption.crt
new file mode 100644
index 00000000..5c0dc5e7
--- /dev/null
+++ b/eidas-connector-common/overlay/etc/eidas-connector/credentials/idp/idp-encryption.crt
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDLDCCAhSgAwIBAgIUCfpIbZSBf3OU/ZtDgB9euCA3NMswDQYJKoZIhvcNAQEL
+BQAwHjEcMBoGA1UEAwwTZXVub2RlLmVpZGFzdGVzdC5zZTAeFw0xNjExMDIxMTMx
+MDlaFw0zNjExMDIxMTMxMDlaMB4xHDAaBgNVBAMME2V1bm9kZS5laWRhc3Rlc3Qu
+c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCQHpcf7llXXzEqfUzZ
+MF8HKrdFJSu6T/dxIf0nD+I6D9p2yMrEjfDy2hF+y8AwTWH5sTrFqtvYNF9aubzM
+JsX3C9LzdLXMhtXE1zoiuSfvh6aKSTkqWzU+3c+cRTuBPFdaj/UCWrbEyuAVt3br
+lfXyEsh3MsL7M9t+wbwK00Vk4jDwiWGqLD5ACwVb/BqKubagDY3QAAC2pZg8FAOz
+3MrQ9FykKhtBGVjGN/Q0el2ROeECAV8pePjagkOQd/f8sNkfGSuF8jx6MtnAi1Gw
+vSW7wAtCF1/mHrUBiG3SUeD44Q8bXntIoVwJs7o8w/ZHcETpnzkMtTqQqv3ApVQo
+ubJ7AgMBAAGjYjBgMB0GA1UdDgQWBBR04hoofjW1qWbDPzv5Q1YuTa0V5TA/BgNV
+HREEODA2ghNldW5vZGUuZWlkYXN0ZXN0LnNlhh9odHRwczovL2V1bm9kZS5laWRh
+c3Rlc3Quc2UvaWRwMA0GCSqGSIb3DQEBCwUAA4IBAQCLVCNkeAdQp71EpknGfCUA
+DTvYhFUHpqCmTdxFmPrNE5ZWyk5ajOP2Uzk5FZYqki7cVqDWbwFOvEfFJNEljc+3
+3jOqDmToeJiWkI91JC03TFBeXB+1jh0YIJomklLTVG78HNL6mtCWsPyWCpdVDeKJ
+2JRG9+CFcjJLD7isx0YPBSy89HAeR/yXp4tjMDuB7NlSwWgvkh4tOWsJ+zH/WH9k
+DQ9vOQH6PCN+lQfb+X6x7UF7Fap0DEz7cz5myElPMMSiho3Tk4yBwzgDrg466dUH
+y82Wc5xMSbKEroIHfyRtaNG7qJxeha1I1x4fejlZRtGOPP+i+RjXq8GbksSxTYPV
+-----END CERTIFICATE-----
diff --git a/eidas-connector-common/overlay/etc/eidas-connector/credentials/idp/idp-signing.crt b/eidas-connector-common/overlay/etc/eidas-connector/credentials/idp/idp-signing.crt
new file mode 100644
index 00000000..cbbf3178
--- /dev/null
+++ b/eidas-connector-common/overlay/etc/eidas-connector/credentials/idp/idp-signing.crt
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDLDCCAhSgAwIBAgIUNeDACUwwea25+ChcqcPQqS1RuqMwDQYJKoZIhvcNAQEL
+BQAwHjEcMBoGA1UEAwwTZXVub2RlLmVpZGFzdGVzdC5zZTAeFw0xNjExMDIxMTMx
+MDhaFw0zNjExMDIxMTMxMDhaMB4xHDAaBgNVBAMME2V1bm9kZS5laWRhc3Rlc3Qu
+c2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYvAoNqjmgUiGmX9ek
+iYr6NukKd46C2I59FLzVikVsw3kLb6gUeXig174oi/mP1VdCCfjZ10kLfIVbrdfE
+/hsRvVqWmGWlfTBl2jNBJJk+tEeLYYwpOrK5Gy9U3nhL5wo8bNKOQh192UO37Fpr
+8TQFdS50XXgHl6wQLFiT3lOld1IL5pQZ1lgR1tF4DnJUjkbbTLd6mi3bHDLB09hd
+4RgenmA9rO1swv+y5js0y8HZQCIoQi0rKKuYlcKp5WBz1Y6VoYiGwonXcDAbeg7O
+8MUtbW6MwP87A4PsuHFCw00qZtoDaaZ6CMRI07eohSodOYUcAsA/MWNzY5RnpbLL
+vDklAgMBAAGjYjBgMB0GA1UdDgQWBBRX4x4E9b5zeW5XlGI+1rZ9ZK8dMzA/BgNV
+HREEODA2ghNldW5vZGUuZWlkYXN0ZXN0LnNlhh9odHRwczovL2V1bm9kZS5laWRh
+c3Rlc3Quc2UvaWRwMA0GCSqGSIb3DQEBCwUAA4IBAQBSBwPvICY1802/yoSi0Yen
+K3W7/t99gotn0CdDviB8skwhaV+3kyW6r+GYNHWqwVEEH55qi/Tmlgmth60p6x6o
+8L5L8gvw1FPITRLlCTUqQA+JvOo82+e8UCRRI92Sp9/FIdZaZsz9BCvQnP5ZNAsa
+ndFR7hgokQIx3tJaJfNhEnF6Ta+wG8Kb7heA3C1frhTCK9b4e1TJTWRMH6+iuu53
+RKhv9fiVE5c0vMvrAuv5ZglOr9tK0mnjIikhi1sUrGyaMqtUtAYLpwpKWgtLsks4
+kqSQ4t8gsQK1tk9KC+cZ2Ljmj135wwPkEpeQVStAKXoGd5JCNFbX2h1+J+6cdrIM
+-----END CERTIFICATE-----
diff --git a/eidas-connector-common/overlay/etc/eidas-connector/credentials/idp/metadata-signing.crt b/eidas-connector-common/overlay/etc/eidas-connector/credentials/idp/metadata-signing.crt
new file mode 100644
index 00000000..bead07f5
--- /dev/null
+++ b/eidas-connector-common/overlay/etc/eidas-connector/credentials/idp/metadata-signing.crt
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDVDCCAjygAwIBAgIVAJ3R/7X0ZT1Mk45yPrqWFyRPJbgsMA0GCSqGSIb3DQEB
+CwUAMCUxIzAhBgNVBAMMGmlkcC5wZW5zaW9uc215bmRpZ2hldGVuLnNlMB4XDTE2
+MDMxMTEzMzA0NVoXDTM2MDMxMTEzMzA0NVowJTEjMCEGA1UEAwwaaWRwLnBlbnNp
+b25zbXluZGlnaGV0ZW4uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCJAtB+6Ng0n3WcqkvhqNABO83mfC+g19JF6RIQ8jj5M/99iZavG+TQglQsdXPA
+PN74oTpx/jBbnzVoyKHHqDAnEVXkSiXG+p6528viTNQWjGLdAxHP+z5aGFBqOK3U
+bBnLymEcG5EiPQnpZItB9JcH8Vl8najz0jl8rIdvK0spKZKvUgVGFZ7MVUMt+jYc
+NHOECMUwOgDrABjIkQS4DeMcbw9PZKBaOsxpx96AtdSo1Dclg1o9tQG/UZoHAczY
+PMawOHOYN3VyVAyxFk82a7nHDxszcF9OGnT2KWff2x2h3ifF+G2EvL41YM1YPR6M
+7kKLiI84+/S3WbhYiXrySokPAgMBAAGjezB5MB0GA1UdDgQWBBRS/IcB9Oazog2T
+huZJd4HOLFKF9DBYBgNVHREEUTBPghppZHAucGVuc2lvbnNteW5kaWdoZXRlbi5z
+ZYYxaHR0cHM6Ly9pZHAucGVuc2lvbnNteW5kaWdoZXRlbi5zZS9pZHAvc2hpYmJv
+bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAQUXfm+Ot61FKm+vyLE+PR0Mb+4YJc54+
+4NpZfw7fuN/UItNblBPyiltF3BjlG/PSeTkDej3gmEfnj8tM9IYMmfDERosnZ+gW
+1P6dFu/sKFvQ3fV83/HKLYcn54RDiay/0wBH/fPezn35/x9hKmvM+Bf1PxjXvMFp
+063Da6NGv7y0I2tf1ChtyCWt4f3qMzH5OTHvHFHoZ+VLDmooRMRTjfjxUmRA3VQj
+iz37EdPHrGoGV7fV/GezaXLWNVqrScH7Or0a0C41uuO6QI0KiKIa9CDgcvZJLbwm
+qnsHv29EfQg1hIdwM4iT8SFZSpKkILWqTnVn3Vy1M8/gcV0nNTy9Cg==
+-----END CERTIFICATE-----
diff --git a/eidas-connector-common/overlay/etc/eidas-connector/credentials/idp/sealer.kver b/eidas-connector-common/overlay/etc/eidas-connector/credentials/idp/sealer.kver
new file mode 100644
index 00000000..b4f7208e
--- /dev/null
+++ b/eidas-connector-common/overlay/etc/eidas-connector/credentials/idp/sealer.kver
@@ -0,0 +1,2 @@
+#Wed Nov 02 11:31:10 UTC 2016
+CurrentVersion=1
diff --git a/eidas-connector-common/overlay/etc/eidas-connector/credentials/metadata.crt b/eidas-connector-common/overlay/etc/eidas-connector/credentials/metadata.crt
new file mode 100644
index 00000000..a4750708
--- /dev/null
+++ b/eidas-connector-common/overlay/etc/eidas-connector/credentials/metadata.crt
@@ -0,0 +1,30 @@
+-----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==
+-----END CERTIFICATE-----
diff --git a/eidas-connector-common/overlay/etc/eidas-connector/credentials/sealer.kver b/eidas-connector-common/overlay/etc/eidas-connector/credentials/sealer.kver
new file mode 100644
index 00000000..b4f7208e
--- /dev/null
+++ b/eidas-connector-common/overlay/etc/eidas-connector/credentials/sealer.kver
@@ -0,0 +1,2 @@
+#Wed Nov 02 11:31:10 UTC 2016
+CurrentVersion=1
diff --git a/eidas-connector-common/overlay/etc/eidas-connector/credentials/sp/metadata-signing.crt b/eidas-connector-common/overlay/etc/eidas-connector/credentials/sp/metadata-signing.crt
new file mode 100644
index 00000000..bead07f5
--- /dev/null
+++ b/eidas-connector-common/overlay/etc/eidas-connector/credentials/sp/metadata-signing.crt
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDVDCCAjygAwIBAgIVAJ3R/7X0ZT1Mk45yPrqWFyRPJbgsMA0GCSqGSIb3DQEB
+CwUAMCUxIzAhBgNVBAMMGmlkcC5wZW5zaW9uc215bmRpZ2hldGVuLnNlMB4XDTE2
+MDMxMTEzMzA0NVoXDTM2MDMxMTEzMzA0NVowJTEjMCEGA1UEAwwaaWRwLnBlbnNp
+b25zbXluZGlnaGV0ZW4uc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCJAtB+6Ng0n3WcqkvhqNABO83mfC+g19JF6RIQ8jj5M/99iZavG+TQglQsdXPA
+PN74oTpx/jBbnzVoyKHHqDAnEVXkSiXG+p6528viTNQWjGLdAxHP+z5aGFBqOK3U
+bBnLymEcG5EiPQnpZItB9JcH8Vl8najz0jl8rIdvK0spKZKvUgVGFZ7MVUMt+jYc
+NHOECMUwOgDrABjIkQS4DeMcbw9PZKBaOsxpx96AtdSo1Dclg1o9tQG/UZoHAczY
+PMawOHOYN3VyVAyxFk82a7nHDxszcF9OGnT2KWff2x2h3ifF+G2EvL41YM1YPR6M
+7kKLiI84+/S3WbhYiXrySokPAgMBAAGjezB5MB0GA1UdDgQWBBRS/IcB9Oazog2T
+huZJd4HOLFKF9DBYBgNVHREEUTBPghppZHAucGVuc2lvbnNteW5kaWdoZXRlbi5z
+ZYYxaHR0cHM6Ly9pZHAucGVuc2lvbnNteW5kaWdoZXRlbi5zZS9pZHAvc2hpYmJv
+bGV0aDANBgkqhkiG9w0BAQsFAAOCAQEAQUXfm+Ot61FKm+vyLE+PR0Mb+4YJc54+
+4NpZfw7fuN/UItNblBPyiltF3BjlG/PSeTkDej3gmEfnj8tM9IYMmfDERosnZ+gW
+1P6dFu/sKFvQ3fV83/HKLYcn54RDiay/0wBH/fPezn35/x9hKmvM+Bf1PxjXvMFp
+063Da6NGv7y0I2tf1ChtyCWt4f3qMzH5OTHvHFHoZ+VLDmooRMRTjfjxUmRA3VQj
+iz37EdPHrGoGV7fV/GezaXLWNVqrScH7Or0a0C41uuO6QI0KiKIa9CDgcvZJLbwm
+qnsHv29EfQg1hIdwM4iT8SFZSpKkILWqTnVn3Vy1M8/gcV0nNTy9Cg==
+-----END CERTIFICATE-----
diff --git a/eidas-connector-common/overlay/etc/eidas-connector/credentials/sp/sp-encryption.crt b/eidas-connector-common/overlay/etc/eidas-connector/credentials/sp/sp-encryption.crt
new file mode 100644
index 00000000..2d86c38d
--- /dev/null
+++ b/eidas-connector-common/overlay/etc/eidas-connector/credentials/sp/sp-encryption.crt
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDKTCCAhECBgFXR/yQDzANBgkqhkiG9w0BAQ0FADBYMSAwHgYDVQQDExdTd2Vk
+aXNoIFRlc3QgZUlEQVMgTm9kZTEnMCUGA1UEChMeU3dlZGlzaCBFLUlkZW50aWZp
+Y2F0aW9uIEJvYXJkMQswCQYDVQQGEwJTRTAeFw0xNjA5MjAxMjI1MTZaFw0yMTA5
+MjAxNDI1MTZaMFgxIDAeBgNVBAMTF1N3ZWRpc2ggVGVzdCBlSURBUyBOb2RlMScw
+JQYDVQQKEx5Td2VkaXNoIEUtSWRlbnRpZmljYXRpb24gQm9hcmQxCzAJBgNVBAYT
+AlNFMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtuXrBnG1Pn8neYFz
+0sIEd0flNkkCaaY/uO0QFGGIDPKwEDVA96V3UTPgyc7jYRoRq/k/ho4zcZAzc2Qk
+r9URloqNKwHIcGiz4p4JpZHGyXKmAc7x822qQ3+p0slW909MKtR/PPqElwbIF1XO
+O6gsW8Pu84xhjgkEU/9K6CepuxUIXn2mto50tKipPtMAbvRUglZYyZj3fTbzNW6H
+0cBkOkFE3aNMOb8fnKpA2UwRkYLcgiGkUgA0LuXZZFm+t5y6CojYw5uCJC+qq9fu
+9zZ4kyJiO67pj8yQ0IZnbH2tUalYBRyFkvPSoSDC32yV4SF+Aww25r3OOX6J5l99
+1DYGJwIDAQABMA0GCSqGSIb3DQEBDQUAA4IBAQCi1Grsd6MQpdK4J1rR4bI3UOnv
+hUQpNuKz9kJhTOex0gDdF3ZgBoypdSTNhn8JoGmFhGEShhiIjtPm1RyOyDizaw7a
+GAnCu/8VApyiSs5IKtQuqCHQwIDThF7dCKnQmRNvjUBcDamzNfZXMt0nlyB/rgSm
+PLrfqrw1+1Dh4FRnxwm87j9Z2gN2e/qt/dwzPhnJhPfa1jsPs3yH71CgQE9i3HE+
+G5PpUBDnDXHARhVPy966TL939x0KrLJrKy62gbU+A+bb7AYDNDf7kK11voxomu74
+A3E5UJrxVSv7/qRcrq0JT33cWUfREvmmBJY34CZqz0Cz7oW40LH0n6KL+kiy
+-----END CERTIFICATE-----
+
diff --git a/eidas-connector-common/overlay/etc/eidas-connector/credentials/sp/sp-signing.crt b/eidas-connector-common/overlay/etc/eidas-connector/credentials/sp/sp-signing.crt
new file mode 100644
index 00000000..2d86c38d
--- /dev/null
+++ b/eidas-connector-common/overlay/etc/eidas-connector/credentials/sp/sp-signing.crt
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDKTCCAhECBgFXR/yQDzANBgkqhkiG9w0BAQ0FADBYMSAwHgYDVQQDExdTd2Vk
+aXNoIFRlc3QgZUlEQVMgTm9kZTEnMCUGA1UEChMeU3dlZGlzaCBFLUlkZW50aWZp
+Y2F0aW9uIEJvYXJkMQswCQYDVQQGEwJTRTAeFw0xNjA5MjAxMjI1MTZaFw0yMTA5
+MjAxNDI1MTZaMFgxIDAeBgNVBAMTF1N3ZWRpc2ggVGVzdCBlSURBUyBOb2RlMScw
+JQYDVQQKEx5Td2VkaXNoIEUtSWRlbnRpZmljYXRpb24gQm9hcmQxCzAJBgNVBAYT
+AlNFMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtuXrBnG1Pn8neYFz
+0sIEd0flNkkCaaY/uO0QFGGIDPKwEDVA96V3UTPgyc7jYRoRq/k/ho4zcZAzc2Qk
+r9URloqNKwHIcGiz4p4JpZHGyXKmAc7x822qQ3+p0slW909MKtR/PPqElwbIF1XO
+O6gsW8Pu84xhjgkEU/9K6CepuxUIXn2mto50tKipPtMAbvRUglZYyZj3fTbzNW6H
+0cBkOkFE3aNMOb8fnKpA2UwRkYLcgiGkUgA0LuXZZFm+t5y6CojYw5uCJC+qq9fu
+9zZ4kyJiO67pj8yQ0IZnbH2tUalYBRyFkvPSoSDC32yV4SF+Aww25r3OOX6J5l99
+1DYGJwIDAQABMA0GCSqGSIb3DQEBDQUAA4IBAQCi1Grsd6MQpdK4J1rR4bI3UOnv
+hUQpNuKz9kJhTOex0gDdF3ZgBoypdSTNhn8JoGmFhGEShhiIjtPm1RyOyDizaw7a
+GAnCu/8VApyiSs5IKtQuqCHQwIDThF7dCKnQmRNvjUBcDamzNfZXMt0nlyB/rgSm
+PLrfqrw1+1Dh4FRnxwm87j9Z2gN2e/qt/dwzPhnJhPfa1jsPs3yH71CgQE9i3HE+
+G5PpUBDnDXHARhVPy966TL939x0KrLJrKy62gbU+A+bb7AYDNDf7kK11voxomu74
+A3E5UJrxVSv7/qRcrq0JT33cWUfREvmmBJY34CZqz0Cz7oW40LH0n6KL+kiy
+-----END CERTIFICATE-----
+
diff --git a/eidas-connector-common/overlay/etc/eidas-connector/credentials/test-metadata.crt b/eidas-connector-common/overlay/etc/eidas-connector/credentials/test-metadata.crt
new file mode 100644
index 00000000..3686046a
--- /dev/null
+++ b/eidas-connector-common/overlay/etc/eidas-connector/credentials/test-metadata.crt
@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIICyzCCAbMCBgFEwQFDRDANBgkqhkiG9w0BAQUFADApMScwJQYDVQQDDB5Td2VkaXNoIEUtaWRl
+bnRpZmljYXRpb24gYm9hcmQwHhcNMTQwMzE0MTIzMTI5WhcNMTkwMzE0MTQzMTI5WjApMScwJQYD
+VQQDDB5Td2VkaXNoIEUtaWRlbnRpZmljYXRpb24gYm9hcmQwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQCGxrPbCuZYeMZniwOAIO1MiQjGD3LIfaLBddNucsAVrxpYW7bYMwzvgL2Gp4yV
+6IyAx5kUgHPjEkEEIjH+NhxYdChD8iWBkLuaOkxyYNXFjFQ3APk5kqP+BB+fP8peWlKGX6S2mfcB
+7eObDQqb28osfXE+bak4X2rNf5i+Yx9VdXBpRhDxk7umDdWTSJlc+ZCxWUt3ldc58/sXIgAzVWk4
+9A3GIvOHlBVgm/5g3yzU9HnxD1fyOKT+NkF5J9mjM0x8Qg9K/Zep3n1xmb8kZ/vcRxv+AounGDd7
+w/QWW84sPegySHqm5GkLSgwB63nJZr5wS+qoT9sTooCM0AhBhY1FAgMBAAEwDQYJKoZIhvcNAQEF
+BQADggEBAESqy6GrAEbL/blJQxDb/LCCW4y3KAAs/pqvR4SQMP0rvVe5FJiUJsE/6DEhk+cl0N+o
+5e8/NusIUD7f6vKSYTHgCodSeDYGdrkRrOucDBWgIlYVsR3yTb/za3AlgiTW6eGGqiY6SeEzXNTM
+5o0GpoZbknQZEK/xCJLtMAU6oX7pDBLahtYeJAJJNFVjtPKsERr2Ob2ni9XW8+fxyjv0v2gmlQvW
+i6VnpD6VJ3nwAFDsGHBgzli32YBd62rukqyiqvC595LNg0Dg4fyv1ZuOiqajWSd3x8JI6bS01QvY
+3fNKY84wMQXpRq9C3zRtpPKmh22W6mcQvh1uN3qNaIEEklE=
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/eidas-connector-common/overlay/etc/eidas-connector/credentials/tomcat/tomcat-cert.pem b/eidas-connector-common/overlay/etc/eidas-connector/credentials/tomcat/tomcat-cert.pem
new file mode 100644
index 00000000..b43da964
--- /dev/null
+++ b/eidas-connector-common/overlay/etc/eidas-connector/credentials/tomcat/tomcat-cert.pem
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDUTCCAjmgAwIBAgIEWW871DANBgkqhkiG9w0BAQUFADBJMQswCQYDVQQGEwJT
+RTESMBAGA1UEChMJTGl0c2VjIEFCMRQwEgYDVQQLEwtEZXZlbG9wbWVudDEQMA4G
+A1UEAxMHVGVzdCBDQTAeFw0xNzA3MTkxMTAwMzZaFw0xOTA3MTgxMTAwMzZaMEsx
+CzAJBgNVBAYTAlNFMRIwEAYDVQQKEwlMaXRzZWMgQUIxFDASBgNVBAsTC0RldmVs
+b3BtZW50MRIwEAYDVQQDEwlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQC8zdWUovaLMHIIUS6V2wzZUkf8a3/JAvyO2b8CzNGzKLHKCRqy
+dgP2ntDBnr2Nv8R6Hb2DPhS3sC1iauQf06P/hkQ59f0U69+oiW4qXNtDM74VKk9U
+YVlQfKGjsafaqWW21PDnckAL4KNeIOeO82bGK6AaH1xEqUYoGDc3iDWmoTGXyTIr
+SEx1RyA2JMYjqZmnZYHrTrXOPbQHxuC0Gq1RFzT9wC2+0Ag+FhoMS15DoTio8RhV
+S8Cy4aFdYN/ILihfiDG/IJM63YYdtcaC4g91mo48F4cCDoVHezxLSizr2jBLkh5A
+KYcEMQEBTXsH/N2F9T57tKPibOj4tFojfvY1AgMBAAGjPzA9MAwGA1UdEwEB/wQC
+MAAwHQYDVR0OBBYEFN8rvSiHoiANd2pToRVfKUvqpge9MA4GA1UdDwEB/wQEAwID
+uDANBgkqhkiG9w0BAQUFAAOCAQEAJvGNiDPTHQICdmk7Pwp1Mq99gLbYvN6GBqTP
+ms8Z0VPpm6DUmn7rXwoRs6iv6X5FJCKKqYf9+CrKyyc4In0HESnTBkFUp4gUrbIZ
+wsoPIuLaUazGUDOumBJn5gcwfYY+ofUSXKho3ldZ5Pehns1QRvrch5NV0mVzdnCy
+XkR4ARBVqSduf4SWwdRr4ge7li14Sqip1iH6/2JuOGIHaTL+uhbpd3bTlP21TkmL
+w7iDnlk4n6HfrIExF8ntBR+j70pLg5FyYGs2BVeut79Ss6m7hUZbnYZiYRRN0/bY
+NfuAPn66WUEWxJ3V7Ne+0e0ndyxsATiV0CdyS2MDtEcAadfrWQ==
+-----END CERTIFICATE-----
diff --git a/eidas-connector-common/overlay/etc/eidas-connector/credentials/tomcat/tomcat-chain.pem b/eidas-connector-common/overlay/etc/eidas-connector/credentials/tomcat/tomcat-chain.pem
new file mode 100644
index 00000000..a1bf757a
--- /dev/null
+++ b/eidas-connector-common/overlay/etc/eidas-connector/credentials/tomcat/tomcat-chain.pem
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDMTCCAhmgAwIBAgIEdW3GUDANBgkqhkiG9w0BAQsFADBJMQswCQYDVQQGEwJT
+RTESMBAGA1UEChMJTGl0c2VjIEFCMRQwEgYDVQQLEwtEZXZlbG9wbWVudDEQMA4G
+A1UEAxMHVGVzdCBDQTAeFw0xNTA4MjAxMjE5MTRaFw0yNTA4MTcxMjE5MTRaMEkx
+CzAJBgNVBAYTAlNFMRIwEAYDVQQKEwlMaXRzZWMgQUIxFDASBgNVBAsTC0RldmVs
+b3BtZW50MRAwDgYDVQQDEwdUZXN0IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAwYIB/XxPIU3MA6KxnBwappMrZpwM2Q7T83xwyDqIrxBeEpvnEL7P
+9ee7t8G2YD1uUv6iqYyWA6uikBu8hhT9E+M7lU5wXQWwkBPotsYUB2lOA93J3Bob
+4ql/tcc64UKDb5ADc0yvKsyi/GE+Z3arGH9IKSS6eFKOO0fJdLqBv4qOBKSg8rLl
+NCDm2bWpZ7fK6ZrhbwpDtBi/I4ZZpuPgbc4y61IxLRxvs6eOqmMn5d2s+C92rmkp
+FKZlKhWOKj4UHZ6RymhwKdldGdxFS0BvEhHOiXcMFPW3ijUTs0T1D82BT1GyieKD
+t5gAPBueMVb7E9kfv/6Y4itX+MFFz4q6gwIDAQABoyEwHzAdBgNVHQ4EFgQUKYA+
+RBaWPM5FCsMZ84x017O7E7swDQYJKoZIhvcNAQELBQADggEBAJL6FJVqo+zGdgzg
+Wm+Sg/Yds+qEKTRKg3r41P9LShqaC8QPJ0ssL3gaPSrSyx3Msc2+wnvzgKsVioz9
+1NePSVu3PxcMRc3XO6GEqUFBEFl+X0QIm1kEBaMKacxFRI1P/3b1vaZCds6oaG4p
+uD73UETUlxUPNV1SNwyzstB6MuHOopIQsYU6bhTItBkdzDvkwOTFSBBMFzfE+N60
+cZec+e4wiWbJ4Vjmq38rKpN0STrtS4rQ2mMnq0Jk2UQM+iXGXoJGOhptGHqYF4PP
+/mh2gCBAe43TDxoftoPd1xdBh1iRbBO3OAcAk7y+mcLrrtiAUdMJmn6dVQL51Mzf
+rrMQAKQ=
+-----END CERTIFICATE-----
diff --git a/eidas-connector-common/overlay/etc/eidas-connector/eidas-connector.conf b/eidas-connector-common/overlay/etc/eidas-connector/eidas-connector.conf
new file mode 100644
index 00000000..f1583ac9
--- /dev/null
+++ b/eidas-connector-common/overlay/etc/eidas-connector/eidas-connector.conf
@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+
+#
+# Template for eIDAS Connector configuration
+# Script within docker container reads from /etc/eidas-connector/env/ - So make sure to have a volume mount.
+#
+
+#
+# Logging settings
+#
+
+# Logback log levels
+# There must be a Docker volume mounted to the /etc/eidas-connector directory.
+export IDP_LOG_SETTINGS_FILE=/etc/eidas-connector/loglevels.xml
+
+# Process logs go to stdout
+export IDP_LOG_CONSOLE=true
+
+# Syslog (for Audit and F-TICKS)
+export IDP_SYSLOG_HOST=syslog.nordu.net
+export IDP_SYSLOG_PORT=514
+
+# F-TICKS and Audit
+export IDP_FTICKS_FEDERATION_ID=eIDAS
+
+# Different formats -> different facilities (?)
+export IDP_FTICKS_SYSLOG_FACILITY=AUTHPRIV
+export IDP_AUDIT_SYSLOG_FACILITY=AUTH
+
+
+# JVM settings
+export JVM_MAX_HEAP=1536m
+export JVM_START_HEA=512m
+
+export IDP_TLS_TRUSTED_CERTS=/etc/ssl/certs/infra.crt
+
+export IDP_CREDENTIALS=/etc/eidas-connector/credentials
+export IDP_SEALER_STORE_RESOURCE=$IDP_CREDENTIALS/sealer.jks
+export IDP_SEALER_VERSION_RESOURCES=$IDP_CREDENTIALS/sealer.kver
+
+export IDP_SIGNING_KEY=$IDP_CREDENTIALS/connector.key
+export IDP_SIGNING_CERT=$IDP_CREDENTIALS/connector.crt
+export IDP_ENCRYPTION_KEY=$IDP_CREDENTIALS/connector.key
+export IDP_ENCRYPTION_CERT=$IDP_CREDENTIALS/connector.crt
+export IDP_METADATA_SIGNING_KEY=$IDP_CREDENTIALS/metadata.key
+export IDP_METADATA_SIGNING_CERT=$IDP_CREDENTIALS/metadata.crt
+
+export SP_CREDENTIALS=/etc/eidas-connector/credentials
+export SP_SIGNING_KEY=$SP_CREDENTIALS/connector.key
+export SP_SIGNING_CERT=$SP_CREDENTIALS/connector.crt
+export SP_ENCRYPTION_KEY=$SP_CREDENTIALS/connector.key
+export SP_ENCRYPTION_CERT=$SP_CREDENTIALS/connector.crt
+export SP_METADATA_SIGNING_KEY=$SP_CREDENTIALS/metadata.key
+export SP_METADATA_SIGNING_CERT=$SP_CREDENTIALS/metadata.crt
+
+# Tomcat settings
+export TOMCAT_CREDENTIALS=/etc/eidas-connector/credentials/tomcat
+export TOMCAT_TLS_SERVER_KEY=$TOMCAT_CREDENTIALS/tomcat-key.pem
+export TOMCAT_TLS_SERVER_CERTIFICATE=$TOMCAT_CREDENTIALS/tomcat-cert.pem
+export TOMCAT_TLS_SERVER_CERTIFICATE_CHAIN=$TOMCAT_CREDENTIALS/tomcat-chain.pem
+export TOMCAT_INTERNAL_PROXIES='"10\.\d{1,3}\.\d{1,3}\.\d{1,3}\|192\.168\.\d{1,3}\.\d{1,3}\|169\.254\.\d{1,3}\.\d{1,3}\|127\.\d{1,3}\.\d{1,3}\.\d{1,3}\|172\.1[6-9]{1}\.\d{1,3}\.\d{1,3}\|172\.2[0-9]{1}\.\d{1,3}\.\d{1,3}\|172\.3[0-1]{1}\.\d{1,3}\.\d{1,3}\|130\.242\.125\.\d{1,3}\|81\.236\.48\.\d{1,3}"'
+
+FEDERATION_METADATA_URL=https://qa.md.swedenconnect.se/entities
+FEDERATION_METADATA_VALIDATION_CERT=/etc/eidas-connector/credentials/metadata.crt
+SECONDARY_FEDERATION_METADATA_URL=http://eid.svelegtest.se/metadata/feed
+SECONDARY_FEDERATION_METADATA_VALIDATION_CERT=/etc/eidas-connector/credentials/test-metadata.crt
+
+EIDAS_METADATA_SERVICE_LIST_URL=https://qa.md.eidas.swedenconnect.se/mdservicelist-aggregate.xml
+EIDAS_METADATA_SERVICE_LIST_VALIDATION_CERT=/etc/eidas-connector/credentials/metadata.crt
+
+EIDAS_METADATA_URL=https://qa.md.eidas.swedenconnect.se/entities
+EIDAS_METADATA_VALIDATION_CERT=/etc/eidas-connector/credentials/metadata.crt
diff --git a/eidas-connector-common/overlay/etc/eidas-connector/loglevels.xml b/eidas-connector-common/overlay/etc/eidas-connector/loglevels.xml
new file mode 100644
index 00000000..a251a08d
--- /dev/null
+++ b/eidas-connector-common/overlay/etc/eidas-connector/loglevels.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cache/.placeholder b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cache/.placeholder
new file mode 100644
index 00000000..e69de29b
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/application.properties b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/application.properties
new file mode 100644
index 00000000..a43bcb8a
--- /dev/null
+++ b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/application.properties
@@ -0,0 +1,98 @@
+# Logging
+logging.level.org.springframework.web=INFO
+
+# Service path
+server.context-path=/eidas-ps
+
+proxy-service.path.prefix=${spring.config.location}..
+proxy-service.config.location=file://${spring.config.location}
+
+# Service port connector settings
+server.port=8443
+#server.ssl.key-store=${proxy-service.path.prefix}/keystore/sslSnakeOil.p12
+#server.ssl.key-store-type=PKCS12
+#server.ssl.key-store-password=secret
+#server.ssl.key-password=secret
+
+tomcat.ajp.port=8009
+tomcat.ajp.remoteauthentication=false
+tomcat.ajp.enabled=true
+
+# For development. Allowing signature check on metadata to be skipped. Default false.
+#proxy-service.dev.ignoreMetadataSignCheck=true
+
+# Initial delay in milliseconds (default 5000) and seconds between metadata configuration recache (default 240 sec).
+#proxy-service.daemon.inital.delay.ms=5000
+proxy-service.daemon.recache.delay.sec=240
+
+# Location of other properties files (general-metadata.properties, psidp-metadata.properties and natsp-metadata.properties)
+# Example specifying external location: 'proxy-service.config.location=file:///opt/webapp/eidas-ps/cfg/'
+# Example specifying src/main/resources config location: 'classpath:'
+
+proxy-service.country=SE
+
+# Key Store properties
+# Location can be specified as "classpath:" or as file path e.g "/opt/webapp/eidas-ps/keystore/keyStore.jks"
+proxy-service.keySourceType=PKCS12
+proxy-service.keySourceLocation=${proxy-service.path.prefix}/proxy.p12
+proxy-service.keySourcePass=dummy
+proxy-service.keySourceAlias=proxy
+
+proxy-service.natsp.keySourceType=PKCS12
+proxy-service.natsp.keySourceLocation=${proxy-service.path.prefix}/proxy.p12
+proxy-service.natsp.keySourcePass=dummy
+proxy-service.natsp.keySourceAlias=proxy
+
+proxy-service.metadata.keySourceType=PKCS12
+proxy-service.metadata.keySourceLocation=${proxy-service.path.prefix}/metadata.p12
+proxy-service.metadata.keySourcePass=dummy
+proxy-service.metadata.keySourceAlias=metadata
+
+# Session Encryption properties
+#proxy-service.cookieEncryptPw=changeme
+
+# Requirements to show consent dialogue (Default false);
+proxy-service.consent=true
+proxy-service.consent.attributes=urn:oid:1.2.752.201.3.7,\
+ urn:oid:2.5.4.4,\
+ urn:oid:2.5.4.42,\
+ urn:oid:1.3.6.1.5.5.7.9.3,\
+ urn:oid:1.3.6.1.5.5.7.9.1
+proxy-service.consent.valuetranslation=urn:oid:1.3.6.1.5.5.7.9.3
+
+# Welcome page presentation text location
+proxy-service.welcomepage.markdown=${proxy-service.path.prefix}/cfg/infotext.md
+
+#Metadata Service List location specified as either URL (http or https), "file://" or "classpath:"
+proxy-service.eidasMdListLocation=https://qa.md.eidas.swedenconnect.se/mdservicelist-aggregate.xml
+
+# 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
+
+#Metadata location for aggregated metadata specified as either URL (http or https), "file://" or "classpath:"
+proxy-service.eidasMetadataLocation=https://qa.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
+
+# Optional cache dir for caching downloaded metadata. If not set, cache is stored in memory.
+proxy-service.eidasMetadataCacheDirName=${proxy-service.path.prefix}/ps-mdcache
+
+#Metadata location for national IdP metadata specified as either URL (http or https), "file://" or "classpath:"
+
+proxy-service.nationalMetadata.test.location=http://eid.svelegtest.se/metadata/mdx/role/idp.xml
+proxy-service.nationalMetadata.test.certFile=${proxy-service.path.prefix}/cfg/se-metadata-cert.crt
+proxy-service.nationalMetadata.test.cacheFile=${proxy-service.path.prefix}/cache/test-metadata.xml
+proxy-service.nationalMetadata.test.index=1
+
+proxy-service.nationalMetadata.qa.location=https://qa.md.swedenconnect.se/role/idp.xml
+proxy-service.nationalMetadata.qa.certFile=${proxy-service.path.prefix}/cfg/metadata.crt
+proxy-service.nationalMetadata.qa.cacheFile=${proxy-service.path.prefix}/cache/qa-metadata.xml
+proxy-service.nationalMetadata.qa.index=0
+
+management.context-path=/manage
+management.security.enabled=false
+management.port=8444
+management.ssl.enabled=true
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/general-metadata.properties b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/general-metadata.properties
new file mode 100644
index 00000000..8644a155
--- /dev/null
+++ b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/general-metadata.properties
@@ -0,0 +1,12 @@
+psgen.country=SE
+psgen.name=Sweden SE eIDAS ProxyService
+psgen.orgName=Swedish E-Identification Board
+psgen.dispName=Swedish eIDAS Proxy Service
+psgen.orgUrl=http://eidasweb.se
+psgen.supportGivenName=Customer support
+psgen.techGivenName=Technical support
+psgen.supportEmail=support@example.com
+psgen.techEmail=support@example.com
+
+
+
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties
new file mode 100644
index 00000000..06fc7936
--- /dev/null
+++ b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties
@@ -0,0 +1,45 @@
+# Available policies are: natToEidasMapping, natToEidasNotifiedMapping, justEidasLoa
+# Defined meaning:
+# - justEidasLoa = IdP is only allowed if it supports the national eIDAS LoAs
+# - natToEidasMapping = National IdP:s are allowed to respond with national LoA. These counts as non notified eID
+# - natToEidasNotifiedMapping = National IdP:s are allowed to respond with national LoA. These counts as notified eID
+
+idp.testIdp.entityid=https://idp.svelegtest.se/idp
+idp.testIdp.name.sv=Test ID-tjänst
+idp.testIdp.name.en=Test IdP
+idp.testIdp.logo.uri=https://eid.svelegtest.se/logos/elegnamnden_notext_68x67.png
+idp.testIdp.logo.height=67
+idp.testIdp.logo.width=68
+idp.testIdp.loapolicy=natToEidasNotifiedMapping
+idp.testIdp.index=0
+idp.testIdp.consent=true
+
+idp.mobIdp.entityid=https://midp.svelegtest.se/idp
+idp.mobIdp.name.sv=Mobil Test ID Tjänst
+idp.mobIdp.name.en=Mobile Test IdP
+idp.mobIdp.logo.uri=https://eid.svelegtest.se/logos/elegnamnden_notext_68x67.png
+idp.mobIdp.logo.height=67
+idp.mobIdp.logo.width=68
+idp.mobIdp.loapolicy=natToEidasNotifiedMapping
+idp.mobIdp.index=1
+idp.mobIdp.consent=false
+
+idp.ccBankid.entityid=https://eid.identityhub.se/demo/bankid/
+idp.ccBankid.name.sv=BankID
+idp.ccBankid.name.en=BankID
+idp.ccBankid.logo.uri=img/disco/bankid_logo.png
+idp.ccBankid.logo.height=94
+idp.ccBankid.logo.width=100
+idp.ccBankid.loapolicy=natToEidasNotifiedMapping
+idp.ccBankid.index=2
+idp.ccBankid.consent=true
+
+idp.ccTelia.entityid=https://eid.identityhub.se/demo/teliabrowserplugin/
+idp.ccTelia.name.sv=Telia
+idp.ccTelia.name.en=Telia
+idp.ccTelia.logo.uri=img/disco/telia_min_logo.png
+idp.ccTelia.logo.height=89
+idp.ccTelia.logo.width=86
+idp.ccTelia.loapolicy=natToEidasNotifiedMapping
+idp.ccTelia.index=3
+idp.ccTelia.consent=true
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/infotext.md b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/infotext.md
new file mode 100644
index 00000000..b01129ec
--- /dev/null
+++ b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/infotext.md
@@ -0,0 +1,34 @@
+### Proxy Service
+
+This is the Swedish XY Country test proxy sevice of the Swedish eIDAS Pilot
+
+**Relevant resources:**
+
+
+**Metadata validation certificate:**
+
+
+
+```
+${proxy.service.metadata.cert}
+```
+
+
+**Developers:**
+
+>Stefan Santesson
+>Martin Lindström
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/metadata.crt b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/metadata.crt
new file mode 100644
index 00000000..a4750708
--- /dev/null
+++ b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/metadata.crt
@@ -0,0 +1,30 @@
+-----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==
+-----END CERTIFICATE-----
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/natsp-metadata.properties b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/natsp-metadata.properties
new file mode 100644
index 00000000..baab65d7
--- /dev/null
+++ b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/natsp-metadata.properties
@@ -0,0 +1,24 @@
+#EntityID of the n
+natsp.entityId=${proxy-service.domain.prefix}/nat-ps-sp
+natsp.displayNames={\
+ en:'Swedish Citizen Adapter',\
+ sv:'Sveriges internationella legitimeringsnod'\
+ }
+natsp.descriptions={\
+ en:'Test service for the Swedish eIDAS Pilot New Local',\
+ sv:'Testtjänst för Svenska eIDAS piloten'\
+ }
+# Logos are specified as a map with the url as key followed by height,width[,lang] as comma separated parameters.
+natsp.logos={\
+ 'https://eunode.eidastest.se/Connector/custom/idpLogo.png':'276,293'\
+ }
+natsp.assertionConsumerServices={\
+ 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST':'${proxy-service.domain.prefix}/assertionconsumer'\
+ }
+natsp.nameIDFormats=\
+ urn:oasis:names:tc:SAML:2.0:nameid-format:persistent,\
+ urn:oasis:names:tc:SAML:2.0:nameid-format:transient
+natsp.entityCategories=\
+ http://id.elegnamnden.se/ec/1.0/loa3-pnr
+
+
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/psidp-metadata.properties b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/psidp-metadata.properties
new file mode 100644
index 00000000..546cd70d
--- /dev/null
+++ b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/psidp-metadata.properties
@@ -0,0 +1,25 @@
+psmd.gen.entityID=${proxy-service.domain.prefix}/ServiceMetadata
+psmd.ext.supportedEncAlgos=\
+ http://www.w3.org/2009/xmlenc11#aes128-gcm,\
+ http://www.w3.org/2009/xmlenc11#aes192-gcm,\
+ http://www.w3.org/2009/xmlenc11#aes256-gcm
+psmd.ext.supportedSigAlgorithms=\
+ http://www.w3.org/2001/04/xmldsig-more#rsa-sha512,\
+ http://www.w3.org/2001/04/xmldsig-more#rsa-sha256,\
+ http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256
+psmd.ext.supportedDigestAlgorithms=\
+ http://www.w3.org/2001/04/xmldsig-more#sha384,\
+ http://www.w3.org/2001/04/xmlenc#sha512,\
+ http://www.w3.org/2001/04/xmlenc#sha256
+psmd.idp.nameIDFormats=\
+ urn:oasis:names:tc:SAML:2.0:nameid-format:persistent,\
+ urn:oasis:names:tc:SAML:2.0:nameid-format:transient,\
+ urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified
+psmd.idp.ssoList={'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST':'${proxy-service.domain.prefix}/ColleagueRequest'}
+psmd.idp.supportedAttributes=\
+ http://eidas.europa.eu/attributes/naturalperson/CurrentFamilyName,\
+ http://eidas.europa.eu/attributes/naturalperson/CurrentGivenName,\
+ http://eidas.europa.eu/attributes/naturalperson/DateOfBirth,\
+ http://eidas.europa.eu/attributes/naturalperson/PersonIdentifier,\
+ http://eidas.europa.eu/attributes/naturalperson/Gender
+psmd.idp.assuranceCertifications=http://eidas.europa.eu/LoA/substantial
\ No newline at end of file
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/se-metadata-cert.crt b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/se-metadata-cert.crt
new file mode 100644
index 00000000..3686046a
--- /dev/null
+++ b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/se-metadata-cert.crt
@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIICyzCCAbMCBgFEwQFDRDANBgkqhkiG9w0BAQUFADApMScwJQYDVQQDDB5Td2VkaXNoIEUtaWRl
+bnRpZmljYXRpb24gYm9hcmQwHhcNMTQwMzE0MTIzMTI5WhcNMTkwMzE0MTQzMTI5WjApMScwJQYD
+VQQDDB5Td2VkaXNoIEUtaWRlbnRpZmljYXRpb24gYm9hcmQwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQCGxrPbCuZYeMZniwOAIO1MiQjGD3LIfaLBddNucsAVrxpYW7bYMwzvgL2Gp4yV
+6IyAx5kUgHPjEkEEIjH+NhxYdChD8iWBkLuaOkxyYNXFjFQ3APk5kqP+BB+fP8peWlKGX6S2mfcB
+7eObDQqb28osfXE+bak4X2rNf5i+Yx9VdXBpRhDxk7umDdWTSJlc+ZCxWUt3ldc58/sXIgAzVWk4
+9A3GIvOHlBVgm/5g3yzU9HnxD1fyOKT+NkF5J9mjM0x8Qg9K/Zep3n1xmb8kZ/vcRxv+AounGDd7
+w/QWW84sPegySHqm5GkLSgwB63nJZr5wS+qoT9sTooCM0AhBhY1FAgMBAAEwDQYJKoZIhvcNAQEF
+BQADggEBAESqy6GrAEbL/blJQxDb/LCCW4y3KAAs/pqvR4SQMP0rvVe5FJiUJsE/6DEhk+cl0N+o
+5e8/NusIUD7f6vKSYTHgCodSeDYGdrkRrOucDBWgIlYVsR3yTb/za3AlgiTW6eGGqiY6SeEzXNTM
+5o0GpoZbknQZEK/xCJLtMAU6oX7pDBLahtYeJAJJNFVjtPKsERr2Ob2ni9XW8+fxyjv0v2gmlQvW
+i6VnpD6VJ3nwAFDsGHBgzli32YBd62rukqyiqvC595LNg0Dg4fyv1ZuOiqajWSd3x8JI6bS01QvY
+3fNKY84wMQXpRq9C3zRtpPKmh22W6mcQvh1uN3qNaIEEklE=
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/ps-mdcache/.placeholder b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/se/ps-mdcache/.placeholder
new file mode 100644
index 00000000..e69de29b
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/application.properties b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/application.properties
new file mode 100644
index 00000000..57651243
--- /dev/null
+++ b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/application.properties
@@ -0,0 +1,81 @@
+# Logging
+logging.level.org.springframework.web=INFO
+
+# Service path
+server.context-path=/eidas-ps
+
+proxy-service.path.prefix=${spring.config.location}..
+proxy-service.config.location=file://${spring.config.location}
+
+# Service port connector settings
+server.port=8443
+#server.ssl.key-store=${proxy-service.path.prefix}/keystore/sslSnakeOil.p12
+#server.ssl.key-store-type=PKCS12
+#server.ssl.key-store-password=secret
+#server.ssl.key-password=secret
+
+tomcat.ajp.port=8009
+tomcat.ajp.remoteauthentication=false
+tomcat.ajp.enabled=true
+
+# For development. Allowing signature check on metadata to be skipped. Default false.
+#proxy-service.dev.ignoreMetadataSignCheck=true
+
+# Initial delay in milliseconds (default 5000) and seconds between metadata configuration recache (default 240 sec).
+#proxy-service.daemon.inital.delay.ms=5000
+proxy-service.daemon.recache.delay.sec=240
+
+# Location of other properties files (general-metadata.properties, psidp-metadata.properties and natsp-metadata.properties)
+# Example specifying external location: 'proxy-service.config.location=file:///opt/webapp/eidas-ps/cfg/'
+# Example specifying src/main/resources config location: 'classpath:'
+
+
+# Key Store properties
+# Location can be specified as "classpath:" or as file path e.g "/opt/webapp/eidas-ps/keystore/keyStore.jks"
+proxy-service.keySourceType=jks
+proxy-service.keySourceLocation=${proxy-service.path.prefix}/nodeKeyStore.jks
+proxy-service.keySourcePass=local-demo
+proxy-service.keySourceAlias=local-demo-cert
+
+# Session Encryption properties
+#proxy-service.cookieEncryptPw=changeme
+
+# Requirements to show consent dialogue (Default false);
+proxy-service.consent=true
+proxy-service.consent.attributes=urn:oid:1.2.752.201.3.7,\
+ urn:oid:2.5.4.4,\
+ urn:oid:2.5.4.42,\
+ urn:oid:1.3.6.1.5.5.7.9.3,\
+ urn:oid:1.3.6.1.5.5.7.9.1
+proxy-service.consent.valuetranslation=urn:oid:1.3.6.1.5.5.7.9.3
+
+# Welcome page presentation text location
+proxy-service.welcomepage.markdown=${proxy-service.path.prefix}/cfg/infotext.md
+
+#Metadata Service List location specified as either URL (http or https), "file://" or "classpath:"
+proxy-service.eidasMdListLocation=https://eid.svelegtest.se/nodeconfig/mdservicelist
+
+# 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}/eIDASmdListCert.crt
+
+#Metadata location for aggregated metadata specified as either URL (http or https), "file://" or "classpath:"
+proxy-service.eidasMetadataLocation=https://eid.svelegtest.se/nodeconfig/metadata
+
+# 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}/eIDASmdListCert.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
+
+
+#Metadata location for national IdP metadata specified as either URL (http or https), "file://" or "classpath:"
+proxy-service.nationalMetadataLocation=http://eid.svelegtest.se/metadata/mdx/role/idp.xml
+
+# Optional certificate file for validating metadata signatures
+# If no certificate is specified then proxy-service.dev.ignoreMetadataSignCheck=true must be set
+proxy-service.nationalMetadataCert=${proxy-service.path.prefix}/se-metadata-cert.crt
+
+# Optional cache dir for caching downloaded national metadata. If not set, cache is stored in memory.
+proxy-service.nationalPsMetadataCacheDirName=${proxy-service.path.prefix}/ps-mdcache
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/general-metadata.properties b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/general-metadata.properties
new file mode 100644
index 00000000..ef5cf22f
--- /dev/null
+++ b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/general-metadata.properties
@@ -0,0 +1,12 @@
+psgen.country=XY
+psgen.name=Sweden XY eIDAS ProxyService
+psgen.orgName=Swedish E-Identification Board
+psgen.dispName=Swedish eIDAS Proxy Service
+psgen.orgUrl=http://eidasweb.se
+psgen.supportGivenName=Customer support
+psgen.techGivenName=Technical support
+psgen.supportEmail=support@example.com
+psgen.techEmail=support@example.com
+
+
+
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/infotext.md b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/infotext.md
new file mode 100644
index 00000000..bfc4503d
--- /dev/null
+++ b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/infotext.md
@@ -0,0 +1,44 @@
+### Proxy Service
+
+This is the Swedish XY Country test proxy sevice of the Swedish eIDAS Pilot
+
+**Relevant resources:**
+
+
+**Metadata validation certificate:**
+
+
+```
+-----BEGIN CERTIFICATE-----
+MIIDOzCCAiMCBgFfWGgYvjANBgkqhkiG9w0BAQ0FADBhMSkwJwYDVQQDEyBUZXN0IENvdW50cnkg
+ZUlEQVMgUHJveHkgU2VydmljZTEnMCUGA1UEChMeU3dlZGlzaCBFLUlkZW50aWZpY2F0aW9uIEJv
+YXJkMQswCQYDVQQGEwJYWTAeFw0xNzEwMjYwOTE4NTdaFw0yMjEwMjYxMTE4NTdaMGExKTAnBgNV
+BAMTIFRlc3QgQ291bnRyeSBlSURBUyBQcm94eSBTZXJ2aWNlMScwJQYDVQQKEx5Td2VkaXNoIEUt
+SWRlbnRpZmljYXRpb24gQm9hcmQxCzAJBgNVBAYTAlhZMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAoo+9Fjjtx50yc8QzkFHxmRDqZC3/cPvWNIK0bqmXrBdlvstB5kYn0x+t644d9zQA
+v6yXFW3hhSHjTeeB49NVwa2HVxtmkX5VzJLNo0mjQm3c3vAZNooUHzv+deZrl5HhFkZZPD1sLwOb
+dlCHd1ozf60+diD/P0EkMkCwwaVWnq13pHv1XuQOBFmVb0O5/muJrzu6uGZAsPS4SUsg9IFgl1AK
+hcl5FPykNvqYMEamOKCbJoL2mpjUQFGtudlDaqneqz0Jt4syoQmvuFal/0uC1XhKwLNitu3GGceZ
+Mwdq6TJlR1pMNDgFOjSO2Yv0v/3kKtmhiOCBpmXXl4JcWDCMBQIDAQABMA0GCSqGSIb3DQEBDQUA
+A4IBAQBTCQT2OTGE+f5qWe4NiXRZBHfLuU0A2Lj3fm30dA+N/3WO5eOTHCGSEJhSh/SxeFzexTiG
+QSrdUuJtTM+mtqF6v0OfJ55K+dhSNzcE5dtM3ds6qZ73VAJQlxLv3qE4hqR7bLMhvz0Zby0Hq0XJ
++FCMs5vSMDtMi5n/CLqh/ctEacUx+lNfQEjZWHInfntMBRUxwy6SYfqjPdhDneP+IXAertPi/Uqn
+NFkI8ewylphNXoewIEIjfFk6WSAwgc2scWgnj8U4un1LFjl//m4DWCEQEkjwuxNf1pTCQFDW7Gc3
++lNgymwLJoieNYqSOhomsTRZTXyuRI4b/ttebvbNiALS
+-----END CERTIFICATE-----
+```
+
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/natsp-idpdisco.properties b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/natsp-idpdisco.properties
new file mode 100644
index 00000000..24052db8
--- /dev/null
+++ b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/natsp-idpdisco.properties
@@ -0,0 +1,27 @@
+proxy-service.idpdisco.idplist=\
+ testIdp,\
+ mobIdp,\
+ ccBankid,\
+ ccTelia
+proxy-service.idpdisco.langs=\
+ se,\
+ en,\
+ fr
+proxy-service.idpdisco.entityid={\
+ testIdp :'https://idp.svelegtest.se/idp',\
+ mobIdp :'https://midp.svelegtest.se/idp',\
+ ccBankid : 'https://eid.identityhub.se/demo/bankid/',\
+ ccTelia : 'https://eid.identityhub.se/demo/teliabrowserplugin/'\
+ }
+proxy-service.idpdisco.name={\
+ testIdp :'Test ID-tjänst, Test IdP, Test IdP',\
+ mobIdp :'Mobil Test IdP, Mobile Test IdP, Mobile Test IdP',\
+ ccBankid : 'BankID, BankID, BankID',\
+ ccTelia : 'Telia,Telia,Telia'\
+ }
+proxy-service.idpdisco.logo={\
+ testIdp :'https://eid.svelegtest.se/logos/elegnamnden_notext_68x67.png, 67, 68',\
+ mobIdp :'https://eid.svelegtest.se/logos/elegnamnden_notext_68x67.png, 67, 68',\
+ ccBankid : 'img/disco/bankid_logo.png, 94, 100',\
+ ccTelia : 'img/disco/telia_min_logo.png,89,86'\
+ }
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/natsp-metadata.properties b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/natsp-metadata.properties
new file mode 100644
index 00000000..baab65d7
--- /dev/null
+++ b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/natsp-metadata.properties
@@ -0,0 +1,24 @@
+#EntityID of the n
+natsp.entityId=${proxy-service.domain.prefix}/nat-ps-sp
+natsp.displayNames={\
+ en:'Swedish Citizen Adapter',\
+ sv:'Sveriges internationella legitimeringsnod'\
+ }
+natsp.descriptions={\
+ en:'Test service for the Swedish eIDAS Pilot New Local',\
+ sv:'Testtjänst för Svenska eIDAS piloten'\
+ }
+# Logos are specified as a map with the url as key followed by height,width[,lang] as comma separated parameters.
+natsp.logos={\
+ 'https://eunode.eidastest.se/Connector/custom/idpLogo.png':'276,293'\
+ }
+natsp.assertionConsumerServices={\
+ 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST':'${proxy-service.domain.prefix}/assertionconsumer'\
+ }
+natsp.nameIDFormats=\
+ urn:oasis:names:tc:SAML:2.0:nameid-format:persistent,\
+ urn:oasis:names:tc:SAML:2.0:nameid-format:transient
+natsp.entityCategories=\
+ http://id.elegnamnden.se/ec/1.0/loa3-pnr
+
+
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/psidp-metadata.properties b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/psidp-metadata.properties
new file mode 100644
index 00000000..546cd70d
--- /dev/null
+++ b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/cfg/psidp-metadata.properties
@@ -0,0 +1,25 @@
+psmd.gen.entityID=${proxy-service.domain.prefix}/ServiceMetadata
+psmd.ext.supportedEncAlgos=\
+ http://www.w3.org/2009/xmlenc11#aes128-gcm,\
+ http://www.w3.org/2009/xmlenc11#aes192-gcm,\
+ http://www.w3.org/2009/xmlenc11#aes256-gcm
+psmd.ext.supportedSigAlgorithms=\
+ http://www.w3.org/2001/04/xmldsig-more#rsa-sha512,\
+ http://www.w3.org/2001/04/xmldsig-more#rsa-sha256,\
+ http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256
+psmd.ext.supportedDigestAlgorithms=\
+ http://www.w3.org/2001/04/xmldsig-more#sha384,\
+ http://www.w3.org/2001/04/xmlenc#sha512,\
+ http://www.w3.org/2001/04/xmlenc#sha256
+psmd.idp.nameIDFormats=\
+ urn:oasis:names:tc:SAML:2.0:nameid-format:persistent,\
+ urn:oasis:names:tc:SAML:2.0:nameid-format:transient,\
+ urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified
+psmd.idp.ssoList={'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST':'${proxy-service.domain.prefix}/ColleagueRequest'}
+psmd.idp.supportedAttributes=\
+ http://eidas.europa.eu/attributes/naturalperson/CurrentFamilyName,\
+ http://eidas.europa.eu/attributes/naturalperson/CurrentGivenName,\
+ http://eidas.europa.eu/attributes/naturalperson/DateOfBirth,\
+ http://eidas.europa.eu/attributes/naturalperson/PersonIdentifier,\
+ http://eidas.europa.eu/attributes/naturalperson/Gender
+psmd.idp.assuranceCertifications=http://eidas.europa.eu/LoA/substantial
\ No newline at end of file
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/eIDASmdListCert.crt b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/eIDASmdListCert.crt
new file mode 100644
index 00000000..666fba71
--- /dev/null
+++ b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/eIDASmdListCert.crt
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIIDSTCCAjECBgFc72gQnTANBgkqhkiG9w0BAQ0FADBoMScwJQYDVQQKEx5Td2VkaXNoIEUtSWRl
+bnRpZmljYXRpb24gQm9hcmQxCzAJBgNVBAYTAlNFMTAwLgYDVQQDEydTd2VkaXNoIGVJREFTIG5v
+ZGUgdHJ1c3QgY29uZmlnIHNlcnZpY2UwHhcNMTcwNjI4MTQ1MzEzWhcNMjIwNjI4MTU1MzEzWjBo
+MScwJQYDVQQKEx5Td2VkaXNoIEUtSWRlbnRpZmljYXRpb24gQm9hcmQxCzAJBgNVBAYTAlNFMTAw
+LgYDVQQDEydTd2VkaXNoIGVJREFTIG5vZGUgdHJ1c3QgY29uZmlnIHNlcnZpY2UwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCR93BFw1lFLD3IUkYwKFj29R2h2kz8X1mKBoLKufXdTg7F
+HHgkJFUy6Kf+JTWiJoEC60WBTBj1Mf+phA0PS24PDBqErtnv5l1K8x1Bo930NqxMStwFbmaeah5a
+1ZeEMsWWGfJfMU26/yHux4ULkUqwxJQ9x5hYp5qLf/UaCbJvxOLyZ5wmHnups1+hT5AFe/ix6mua
+hKNCJplrZLpnMhFuSjZC+yDDH0F83X71kU0bsm8RKd9OW2t+g+XFRnVpf+mgHPf2bCGxDJpt5h/s
+ipQCP78gXsCL+6J7lS8pnxy/ZW2Qr4cwIvWucTlph0nAEHVv9j2K4pgCKR4hbD5MonFjAgMBAAEw
+DQYJKoZIhvcNAQENBQADggEBAFI5NDg0xPP8GGwItDSPYqF/PbN9k4Rc/ujXVxgNC/cZ3gSYS8Hl
+jcRs2bGx7uiOkJIWiaNXapMptyOgwbjhB4kKLkFnywIH9nV1yYdkf1ToBZJz/SuCAXSkVylTARKa
+memIj/9JL9L0FX7i+qyArJJO8Z7PhSUP1uhGEaPSLA3AuNT9xYzMUvrwf8+aDscvf0h0YjPjrIhn
+r3i8fvkDDSaRPbAe1xJjHZoOA2Y8socfw+8BsGoibaS00wVgjx9+gZWIE5/d6PBQesF3KMPUZZMp
+6WJrOnxk0z03V7R38PB/bTqivErVSYOZ3M8zIyqfPiWM2Fe35tHXXHN8XsQel6s=
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/ps-mdcache/.placeholder b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/ps-mdcache/.placeholder
new file mode 100644
index 00000000..e69de29b
diff --git a/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/se-metadata-cert.crt b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/se-metadata-cert.crt
new file mode 100644
index 00000000..3686046a
--- /dev/null
+++ b/eidas-proxy-common/eidas-qa-proxy/overlay/etc/eidas-proxy/xy/se-metadata-cert.crt
@@ -0,0 +1,15 @@
+-----BEGIN CERTIFICATE-----
+MIICyzCCAbMCBgFEwQFDRDANBgkqhkiG9w0BAQUFADApMScwJQYDVQQDDB5Td2VkaXNoIEUtaWRl
+bnRpZmljYXRpb24gYm9hcmQwHhcNMTQwMzE0MTIzMTI5WhcNMTkwMzE0MTQzMTI5WjApMScwJQYD
+VQQDDB5Td2VkaXNoIEUtaWRlbnRpZmljYXRpb24gYm9hcmQwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQCGxrPbCuZYeMZniwOAIO1MiQjGD3LIfaLBddNucsAVrxpYW7bYMwzvgL2Gp4yV
+6IyAx5kUgHPjEkEEIjH+NhxYdChD8iWBkLuaOkxyYNXFjFQ3APk5kqP+BB+fP8peWlKGX6S2mfcB
+7eObDQqb28osfXE+bak4X2rNf5i+Yx9VdXBpRhDxk7umDdWTSJlc+ZCxWUt3ldc58/sXIgAzVWk4
+9A3GIvOHlBVgm/5g3yzU9HnxD1fyOKT+NkF5J9mjM0x8Qg9K/Zep3n1xmb8kZ/vcRxv+AounGDd7
+w/QWW84sPegySHqm5GkLSgwB63nJZr5wS+qoT9sTooCM0AhBhY1FAgMBAAEwDQYJKoZIhvcNAQEF
+BQADggEBAESqy6GrAEbL/blJQxDb/LCCW4y3KAAs/pqvR4SQMP0rvVe5FJiUJsE/6DEhk+cl0N+o
+5e8/NusIUD7f6vKSYTHgCodSeDYGdrkRrOucDBWgIlYVsR3yTb/za3AlgiTW6eGGqiY6SeEzXNTM
+5o0GpoZbknQZEK/xCJLtMAU6oX7pDBLahtYeJAJJNFVjtPKsERr2Ob2ni9XW8+fxyjv0v2gmlQvW
+i6VnpD6VJ3nwAFDsGHBgzli32YBd62rukqyiqvC595LNg0Dg4fyv1ZuOiqajWSd3x8JI6bS01QvY
+3fNKY84wMQXpRq9C3zRtpPKmh22W6mcQvh1uN3qNaIEEklE=
+-----END CERTIFICATE-----
\ No newline at end of file