diff --git a/eidas-proxy-1.qa.sveidas.se/overlay/etc/hiera/data/local.eyaml b/eidas-proxy-1.qa.sveidas.se/overlay/etc/hiera/data/local.eyaml
index b940907e..894beba3 100644
--- a/eidas-proxy-1.qa.sveidas.se/overlay/etc/hiera/data/local.eyaml
+++ b/eidas-proxy-1.qa.sveidas.se/overlay/etc/hiera/data/local.eyaml
@@ -1,5 +1,4 @@
-
-
+---
 
 
 proxy_service_cookie_encrypt_pw: ENC[PKCS7,MIIC5gYJKoZIhvcNAQcDoIIC1zCCAtMCAQAxggJuMIICagIBADBSMEUxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxFjAUBgNVBAMMDWVpZGFzLXByb3h5LTECCQCFdakcs5nuYTANBgkqhkiG9w0BAQEFAASCAgCmuDc+tKLVWc9zgxXyzvEFcophBzUL6LUtUZqTdRVZ474VT7oQE690G0yz1q6kHsKEAYXkAb8kFgMpr+YFiUubuCCbq8xaDoNz4NDX9XzFux6x+2+ZwsZGJDy7R+DIclICEy8SSEXc9NdQyQx+pIToyC7xYI5OR8n+55sFYFGHaVYnfjuTj3CM8v93U/r2M97RWvrMXa9jPuSocLauEk0Qx7hhy6mOhztQvYMlqGNXf5Fk5DjKgiRi4uXLbxUN3izysZE4y/xtRZT93EValxSMXbrW9ydQGXhphpdF1vGbGnY6VjQ6b9QnJljdLQ/bY/H8mZKQDDohRkmILdYMbOnCM+FwOXac9gvGSY+BjcEHWx/DAhQGyGYGCVm/UX22jPWQT/2OntY9V/OX/pLU2F/QaBD3XkGkAur64rtgweCAKGBhg2x/OEHLRLAlGwmpo866Xz3o0x1TTUBER18qycPy1R7g3XYkivOIbh+4eKFGi2K7KlDYO1215t5ssXfhQw3pywg6c941ONasz9nwcrilCoONGm0mbu9om/TqNCI2XC5S+lsCU6ifz97QFB+HHWKxaUxSw78jz0dQD99iaraiTxNPYxnnm1vTnYLoJp2X0Yx3nZb/tnguae3uOl8GBKxYhnNPT6tGmZ6DRUU5LQA8sbpfKk+xz7q5x7b5YfsxDTBcBgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCYUfCPMdH6I47nNTDXOI8VgDArK+LSKmkYX3TDb7yiKp3Tza1TOV8QQW1UTDJX6QGtKcMMnS+3YAbKOTbV7Z71Ino=]
@@ -7,3 +6,5 @@ eidas_metadata_key: ENC[PKCS7,MIIZKgYJKoZIhvcNAQcDoIIZGzCCGRcCAQAxggJuMIICagIBAD
 eidas_proxy_key: ENC[PKCS7,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]
 influxdb2_token: ENC[PKCS7,MIIDFwYJKoZIhvcNAQcDoIIDCDCCAwQCAQAxggJuMIICagIBADBSMEUxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxFjAUBgNVBAMMDWVpZGFzLXByb3h5LTECCQCFdakcs5nuYTANBgkqhkiG9w0BAQEFAASCAgAV+SwOXoagm5gL7DVwc/4+qIyQF8IMqtWS2DUvN9bufUgJ74+C8jvNjv5lMR7DQ3V7rexTC21bA10gQ5r3tv5HYfcRzGOh50CadAUScJzSJMn09rYfvYxnyeuVzS1DoSjHAXcDsuSzUuUD6PdrNc3DfnG8g2+1QZyBkrCgnbfbCRNAa6MM+9d2zOlURwbDRjcVvRl2QsBqXopYp0CAwC+/eDVj7pJH/6aZuK9TxpS4yLAXHx/F6L31v1+DfjD8SIL+LlNARclX6D9yzRlvQtLiTsqBLLfwJheYQAosqajtaU19nUHhzT4YbFMCgAc6GICgsV1H3EzjrQgbLYjeMJpduUYuZ2q15AP2/Vz6uhTaVWQ7/wolxaHFWGHiO/4JrvKY8T1Qb8vkglPiEKGtYzi64d0yzMSHhjZ2QFA5BSYJK25A7uT9QY/HOneZ+KlRl6dExofzODAhg5bNorBav3VVpC5VwbzOn6Vu8vh0TBOd7mWPMp+GpRWbFOSZHHb8kiVfJbeyFPF4hhRKjuGnoJQ3NP3dsjJrdufhIz5xoUrEH2Hp4+GVhHDlvMU/MDuyiq+Sr1SYITwFDXdIhG5f7wivxsS3pnxk0stfAxQHaF6AcUGFuzU4NIFCmP0GTgw+yHjk7rQY85M3mUPEeI+dHYDimFZ0fswulKHT1uYQBtqfpzCBjAYJKoZIhvcNAQcBMB0GCWCGSAFlAwQBKgQQ2Yj17bG1zc2O1noMKOiW3YBg1i4lxh1YtXENYXJ3+hubm1m8ruEt1Ad9mOq6wMAloTM6GhtVbCbhWfyLRx4TOIaRW9Y2YKw6RRYxGfVAwZtdjsNLwxxazGl97wMkrQbZfl7iWITY8rO3movUibttOMXg]
 influx2_token: ENC[PKCS7,MIIDFwYJKoZIhvcNAQcDoIIDCDCCAwQCAQAxggJuMIICagIBADBSMEUxCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxFjAUBgNVBAMMDWVpZGFzLXByb3h5LTECCQCFdakcs5nuYTANBgkqhkiG9w0BAQEFAASCAgBjKLglE0SxNax+gFaHzk4yY6pMYrmSyKUFNTknmaoqwXXT99EENLaysOOSVC7cbOMUPjTxCLYr/AcEKKQ+Xw+Sf4zdyoomXIIP6zX7bJpKqRCwwsFcPJ9eLsphzIbGJPiQ9kGqE74p/TO3Z6/pVJloJdp/fHudQufc5TxyM6y8KxGakbC7YFoeG6nfJE9BABTeo44XdW0JACfaDPsCZvTzZI24KfYZ0z1+5s41ALvx8kd60pD9SPJHQgXip8SGKw0CpZBkXX8gbxuo8ETdq7UTKqg9FBeusTLZKYOMv8MhLgI5rtKK3LYdiD5Crbx11QMkNfBw9UjIR4UPehgi6avm9yErClqkVRLxJph7XWEIcejpEfBngLLiOjQJbFcqgGGLCp2iqzBM03JxUhNHucTG26f4aPVXEgBIx3kizb+gq2uleGuHQG5nyP8sXJu2XHQtc8NrKEaSXeigFS/o+X76N0ctxmLKBV8GCVdDaynmWb0vbKzKNcKyILahMD2gPcbKmf/WyV5MYaLYazNNdjaQVgBa1wDA4DFx0K24CPWlOhl+F/DlXvlgyzab2HG+kAds0FxOqMCNvEd7Xpgb7IYO0uK3OoLjN1U+lE1IDlNUp0rF6hWhNII5u0IgiDQzD7x4hjDYOAgfzM609/GpdFEVO30IfakFlRZpTXjbW6N1GzCBjAYJKoZIhvcNAQcBMB0GCWCGSAFlAwQBKgQQaUWZzEuN0Bzy8B0vUiiuiIBgIJS6K8sEqNLS/wO3PJs7FqvMQBLw20iQjjQII7Eos7DkblxafcItg3Oxo3xwjCLxSbr8uP7sgpJsOqUX5zXSfwmDKplTnj+GXWy1qsijuZV772ltvAVyqU7+WKXwhIRN]
+eidas_proxy_oidc_rp_jks: ENC[PKCS7,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]
+
diff --git a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties
index f91ff8c3..9e797e0c 100644
--- a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties
+++ b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties
@@ -20,6 +20,19 @@ idp.freja.deriveDob=false
 idp.freja.privateSpSupport=true
 idp.freja.index=0
 
+idp.bankid.entityid=https://oidc.test.bankid.com
+idp.bankid.name.sv=BankID
+idp.bankid.name.en=BankID
+idp.bankid.logo.uri=https://www.bankid.com/assets/logo-bank-id.svg
+idp.bankid.logo.height=150
+idp.bankid.logo.width=159
+idp.bankid.loapolicy=natToEidasNotifiedMapping
+idp.bankid.consent=false
+idp.bankid.deriveDob=false
+idp.bankid.privateSpSupport=true
+idp.bankid.index=2
+idp.bankid.protocol=oidc
+
 #idp.mobIdp.entityid=https://midp.svelegtest.se/idp
 #idp.mobIdp.name.sv=Legacy Test ID Tjänst
 #idp.mobIdp.name.en=Legacy Test IdP
diff --git a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/oidc-rp.properties b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/oidc-rp.properties
index c8c2057c..cb4df2a9 100644
--- a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/oidc-rp.properties
+++ b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/cfg/oidc-rp.properties
@@ -1 +1,27 @@
-oidc-enabled=false
+oidc-enabled=true
+
+# OIDC client metadata
+client-metadata.client-key[0].alias=oidc-rp
+client-metadata.client-key[0].key-store-location=file://${proxy-service.path.prefix}/keystore/oidc-rp.jks
+client-metadata.client-key[0].password=S3cr3t
+client-metadata.client-key[0].supported-jws-algos=ES256
+client-metadata.preferred-userinfo-signed-response-algs=ES256,PS256,RS256
+client-metadata.redirect-uris[0]=${proxy-service.domain.prefix}/oidc/return
+client-metadata.redirect-uris[1]=https://qa.proxy.eidas.swedenconnect.se/oidc/return
+client-metadata.subject-type=pairwise
+client-metadata.default-acr-values=http://id.elegnamnden.se/loa/1.0/loa3
+
+# OIDC config
+oidc-config.op.bid-op.client-id=digg-eidas-proxy
+oidc-config.op.bid-op.op-metadata-location=file://${proxy-service.path.prefix}/metadata/oidc/bid-op-metadata.json
+oidc-config.op.bid-op.op-jwks-metadata-location=file://${proxy-service.path.prefix}/metadata/oidc/bid-op-jwks.json
+oidc-config.return-url=${proxy-service.domain.prefix}/oidc/return
+
+# HTTP configuration
+http.connect-timeout=1000
+http.read-timeout=5000
+
+# User messages
+user-message.default.sv=Sveriges internationella nod för e-legitimering
+user-message.default.en=Sweden Connect - Cross-border Digital Identification
+
diff --git a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/metadata/oidc/bid-op-jwks.json b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/metadata/oidc/bid-op-jwks.json
new file mode 100644
index 00000000..709ad0e6
--- /dev/null
+++ b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/metadata/oidc/bid-op-jwks.json
@@ -0,0 +1,21 @@
+{
+  "keys" : [ {
+    "kty" : "RSA",
+    "e" : "AQAB",
+    "use" : "sig",
+    "kid" : "FU06ji53d1xJVy4BhUXw3pWSe3SpDZwZdsetIL8qh1Q",
+    "n" : "gClrCXP5Ff9ON-Hfkqp9fZiK_OUWfz4ERWlKZUq54bswJml4oTywhLHdzIf2BK8oHMYUPzAM4uTmf2p37lkgsHHkZUCDbb5UT3TKHmbbtvRbJ7StWea9kmDXRcG0RW_FjfRbFNCrwuc1Z7gzILOXVGcE5nc1-WXSz-6XYAd84U562uTkbZIlolMSVXr_ZHkYAKNNGRyESfsU34kj3SXN9eJmooFUUGXRikskHEDE1otWC8Hds8DmnDcZXmH_MaioJGbJpK3OA6dpkeT5K55ygegO7ADkjWrbmuzPOhIHBovQGhMmkTJGCSJmwX82jZWgT8jEr8JgWc6dsSnPTg91NOqIFegiYyS-4UrlXOcf9h9OHftiPgysHqemAaFS_S_NYEWEcnKoPsPnE2dUxf7OjQuWESknjgqy8N6Jm4Y8srj5fE_4fXKV7ept8tsSFS2Fc3g4Wqpd4XYuiKUYeq8JDISf15jqWw4p129X1nRTskMKrF0FjhMCgWCJDOnD57one6sGsXz9toQ4AKJRjC2O0zylD0cFfmuWN1T5e4dGEiu5Q8nJEyXbQaiOneD1kC5x2pFIEUMuvZ2YRkbVLTzEieyOELbdwegMA6vkiU4IMLSUB3ondIz5IuqaLnp4T0OnWU-d9sdelw_liHA9n__188zrnktvSge5bf8B-SuhLsc"
+  }, {
+    "kty" : "RSA",
+    "e" : "AQAB",
+    "use" : "sig",
+    "kid" : "Cez4Zz2YANA6d9JfVFHzADqsWw_RWqdQ7_L1CPy7dFE",
+    "n" : "nu4CC39I0lwnm6qV1ZSb3lHqpOOiS5XOZGPnszxWqLCPU6K1eFjL62vO2pIN9EC5cKVbJMjSA9-XCJYlLufHm7C80INlyuBOzKYqS7WP6dKc3KX2jsTzvhJpPiBNxyUEm760YpiKB3cHAf7NNa_V0EGnWToTc_jbRTG8GZSgv8lCNNgpBFlJ0LcDTAlB8oau-yKNY4s5Ik3RktVy5IkhO2cXIFSpzYVB3N8I9RD_yeWMrzPv2j_GVHL4wSoaXIZbEz-LVw2VpbKBEzcO-SGSaXpbE58doW15kdj6EipuPxOQKH81Lmi-CTz3D91tQUPjTaACqe_M7_ny3I-gIomhlw"
+  }, {
+    "kty" : "RSA",
+    "e" : "AQAB",
+    "use" : "enc",
+    "kid" : "fF5EqLffTfFXPAoKlwS1m8FxE55jvrjTaAd7H_R41xs",
+    "n" : "yHQ9rcmfPjvHw1MGKb0X56nF5_s3b7FAtH_3XgZP71j_Qf3ez6Go_RuCob74oN-jlUdSNmilYda2w40uYB49J3ZbpIoH9GcPz6KC3qyZjg17Rk2m7_SnERNvZxjn_nd5uC-qfcpRXS2_I7Zu3VPg4TvjU8Zxe5Z6U9a0zmQoco0DLYMbt1mi707EkCjMooTILDKZR9uk_QWGBQKxwmMs8pNag0s9kLzWX1CD7bToWR1637wDv-NjSz3_kHkws0nLEWBYm0cmtXuU51R6OrcOif5Lh9j38P8MQUUC72dv8LwMgT_42DxAyZsbVXn5n-xwjeyVvtZVLfInU8rgdHXmcQ"
+  } ]
+}
diff --git a/eidas-qa-proxy/overlay/etc/eidas-proxy/se/metadata/oidc/bid-op-metadata.json b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/metadata/oidc/bid-op-metadata.json
new file mode 100644
index 00000000..d8bd5cfe
--- /dev/null
+++ b/eidas-qa-proxy/overlay/etc/eidas-proxy/se/metadata/oidc/bid-op-metadata.json
@@ -0,0 +1,35 @@
+{
+  "issuer" : "https://oidc.test.bankid.com",
+  "authorization_endpoint" : "https://oidc.test.bankid.com/authorize",
+  "token_endpoint" : "https://oidc.test.bankid.com/token",
+  "userinfo_endpoint" : "https://oidc.test.bankid.com/userinfo",
+  "jwks_uri" : "https://oidc.test.bankid.com/jwks",
+  "scopes_supported" : [ "openid", "profile", "https://id.oidc.se/scope/naturalPersonNumber", "https://id.oidc.se/scope/naturalPersonName", "https://id.oidc.se/scope/authnInfo", "https://id.oidc.se/scope/sign" ],
+  "response_types_supported" : [ "code" ],
+  "response_modes_supported" : [ "query" ],
+  "grant_types_supported" : [ "authorization_code" ],
+  "acr_values_supported" : [ "http://id.elegnamnden.se/loa/1.0/loa3" ],
+  "subject_types_supported" : [ "public", "pairwise" ],
+  "id_token_signing_alg_values_supported" : [ "RS256", "RS384", "RS512", "PS256", "PS384", "PS512" ],
+  "userinfo_signing_alg_values_supported" : [ "RS256", "RS384", "RS512", "PS256", "PS384", "PS512" ],
+  "request_object_signing_alg_values_supported" : [ "none", "RS256", "ES256", "PS256" ],
+  "request_object_encryption_alg_values_supported" : [ "RSA1_5", "RSA-OAEP", "RSA-OAEP-256" ],
+  "request_object_encryption_enc_values_supported" : [ "A128CBC-HS256", "A128GCM", "A192CBC-HS384", "A192GCM", "A256CBC-HS512", "A256GCM" ],
+  "token_endpoint_auth_methods_supported" : [ "client_secret_post", "client_secret_basic", "private_key_jwt" ],
+  "token_endpoint_auth_signing_alg_values_supported" : [ "RS256", "ES256", "PS256" ],
+  "display_values_supported" : [ "page", "popup", "touch", "wap" ],
+  "claim_types_supported" : [ "normal" ],
+  "claims_supported" : [ "sub", "name", "given_name", "family_name", "txn", "auth_time", "https://id.oidc.se/claim/personalIdentityNumber", "https://id.oidc.se/claim/userCertificate", "https://id.oidc.se/claim/userSignature", "https://id.oidc.se/claim/credentialValidFrom", "https://id.oidc.se/claim/credentialValidTo", "https://id.oidc.se/claim/deviceIp", "https://id.oidc.se/claim/authnEvidence", "https://id.oidc.se/claim/age" ],
+  "service_documentation" : "https://oidc.test.bankid.com/about",
+  "claims_parameter_supported" : true,
+  "request_parameter_supported" : true,
+  "request_uri_parameter_supported" : false,
+  "require_request_uri_registration" : false,
+  "op_policy_uri" : "https://oidc.test.bankid.com/about",
+  "op_tos_uri" : "https://oidc.test.bankid.com/about",
+  "introspection_endpoint" : "https://oidc.test.bankid.com/introspect",
+  "code_challenge_methods_supported" : [ "S256" ],
+  "https://id.oidc.se/disco/userMessageSupported" : true,
+  "https://id.oidc.se/disco/userMessageSupportedMimeTypes" : [ "text/plain", "text/markdown" ],
+  "https://id.oidc.se/disco/authnProviderSupported" : false
+}