diff --git a/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties
index ae124221..daaf4260 100644
--- a/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties
+++ b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/idpdisco.properties
@@ -35,18 +35,18 @@ idp.freja.index=0
 #idp.mobIdp.deriveDob=true
 #idp.mobIdp.index=1
 
-idp.bankid.entityid=https://oidc.bankid.com
-idp.bankid.name.sv=BankID
-idp.bankid.name.en=BankID
-idp.bankid.logo.uri=https://www.bankid.com/assets/bankid/img/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=false
-idp.bankid.index=2
-idp.bankid.protocol=oidc
+#idp.bankid.entityid=https://oidc.bankid.com
+#idp.bankid.name.sv=BankID
+#idp.bankid.name.en=BankID
+#idp.bankid.logo.uri=https://www.bankid.com/assets/bankid/img/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=false
+#idp.bankid.index=2
+#idp.bankid.protocol=oidc
 
 #idp.ccTelia.entityid=https://eid.identityhub.se/demo/teliabrowserplugin/
 #idp.ccTelia.name.sv=Telia
diff --git a/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/oidc-rp.properties b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/oidc-rp.properties
index 0816eafd..e95cc431 100644
--- a/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/oidc-rp.properties
+++ b/eidas-proxy-common/overlay/etc/eidas-proxy/se/cfg/oidc-rp.properties
@@ -1,22 +1,22 @@
-oidc-enabled=true
+oidc-enabled=false
 
 # 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=PS256, RS256
-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://proxy.eidas.swedenconnect.se/oidc/return
-client-metadata.subject-type=pairwise
-client-metadata.default-acr-values=http://id.elegnamnden.se/loa/1.0/loa3
+#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=PS256, RS256
+#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://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=swedenconnectprod
-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
+#oidc-config.op.bid-op.client-id=swedenconnectprod
+#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
 
 # User messages
-user-message.default.sv=Sveriges internationella nod för e-legitimering
-user-message.default.en=Sweden Connect - Cross-border Digital Identification
+#user-message.default.sv=Sveriges internationella nod för e-legitimering
+#user-message.default.en=Sweden Connect - Cross-border Digital Identification