diff --git a/docker/Dockerfile b/docker/Dockerfile
index 15a2520..930ee5a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -21,23 +21,23 @@ RUN unzip /data/TOMCAT/config.zip -d /tmp/
 ENV config_path=/tmp/tomcat
 
 # Replace Demo-country CA localhost URLs with eidas-demo-ca.idporten.dev (for systest for now)
-RUN sed -i 's/http:\/\/localhost:8080\/EidasNodeConnector/https:\/\/eidas-demo-ca.idporten.dev\/EidasNodeConnector/g' $config_path/connector/eidas.xml
-RUN sed -i 's/http:\/\/localhost:8080\/SpecificConnector/https:\/\/eidas-demo-ca.idporten.dev\/SpecificConnector/g' $config_path/connector/eidas.xml
-RUN sed -i 's/http:\/\/localhost:8080/https:\/\/eidas-demo-ca.idporten.dev/g' $config_path/proxy/eidas.xml
-RUN sed -i 's/http:\/\/localhost:8080\/SP/https:\/\/eidas-demo-ca.idporten.dev\/SP/g' $config_path/sp/sp.properties
-RUN sed -i 's/http:\/\/localhost:8080/https:\/\/eidas-demo-ca.idporten.dev/g' $config_path/specificConnector/specificConnector.xml
-RUN sed -i 's/http:\/\/localhost:8080/https:\/\/eidas-demo-ca.idporten.dev/g' $config_path/specificProxyService/specificProxyService.xml
+RUN sed -i 's/http:\/\/localhost:8080\/EidasNodeConnector/https:\/\/eidas-demo-ca.eidasnode.dev\/EidasNodeConnector/g' $config_path/connector/eidas.xml
+RUN sed -i 's/http:\/\/localhost:8080\/SpecificConnector/https:\/\/eidas-demo-ca.eidasnode.dev\/SpecificConnector/g' $config_path/connector/eidas.xml
+RUN sed -i 's/http:\/\/localhost:8080/https:\/\/eidas-demo-ca.eidasnode.dev/g' $config_path/proxy/eidas.xml
+RUN sed -i 's/http:\/\/localhost:8080\/SP/https:\/\/eidas-demo-ca.eidasnode.dev\/SP/g' $config_path/sp/sp.properties
+RUN sed -i 's/http:\/\/localhost:8080/https:\/\/eidas-demo-ca.eidasnode.dev/g' $config_path/specificConnector/specificConnector.xml
+RUN sed -i 's/http:\/\/localhost:8080/https:\/\/eidas-demo-ca.eidasnode.dev/g' $config_path/specificProxyService/specificProxyService.xml
 
-RUN sed -i 's/http:\/\/localhost:8080\/EidasNodeConnector\/ServiceProvider/https:\/\/eidas-demo-ca.idporten.dev\/EidasNodeConnector\/ServiceProvider/g' $config_path/sp/sp.properties
-RUN sed -i 's/http:\/\/localhost:8080\/EidasNodeProxy\/ServiceMetadata/https:\/\/eidas-demo-ca.idporten.dev\/EidasNodeProxy\/ServiceMetadata/g' $config_path/connector/eidas.xml
+RUN sed -i 's/http:\/\/localhost:8080\/EidasNodeConnector\/ServiceProvider/https:\/\/eidas-demo-ca.eidasnode.dev\/EidasNodeConnector\/ServiceProvider/g' $config_path/sp/sp.properties
+RUN sed -i 's/http:\/\/localhost:8080\/EidasNodeProxy\/ServiceMetadata/https:\/\/eidas-demo-ca.eidasnode.dev\/EidasNodeProxy\/ServiceMetadata/g' $config_path/connector/eidas.xml
 
 # Add Norway (NO) as country 6
 RUN sed -i 's/country6.name=CF/country6.name=NO/g' $config_path/sp/sp.properties
-RUN sed -i 's/country6.url=http:\/\/localhost:9080\/EidasNodeConnector/country6.url=https:\/\/eidas-connector.idporten.dev/g' $config_path/sp/sp.properties
+RUN sed -i 's/country6.url=http:\/\/localhost:9080\/EidasNodeConnector/country6.url=https:\/\/eidas-connector.eidasnode.dev/g' $config_path/sp/sp.properties
 
 RUN sed -i 's/service6.id">CF/service6.id">NO/g' $config_path/connector/eidas.xml
 RUN sed -i 's/service6.name">LOCAL-EIDAS-CF/service6.name">EIDAS-NO/g' $config_path/connector/eidas.xml
-RUN sed -i 's/service6.metadata.url">http:\/\/localhost:9080\/EidasNodeProxy/service6.metadata.url">https:\/\/eu-eidas-proxy.idporten.dev/g' $config_path/connector/eidas.xml
+RUN sed -i 's/service6.metadata.url">http:\/\/localhost:9080\/EidasNodeProxy/service6.metadata.url">https:\/\/eu-eidas-proxy.eidasnode.dev/g' $config_path/connector/eidas.xml
 
 
 # Only allow https in proxy and connector
diff --git a/docker/demo-config/MetadataFetcher_Connector.properties b/docker/demo-config/MetadataFetcher_Connector.properties
index 4d89ac5..28df040 100644
--- a/docker/demo-config/MetadataFetcher_Connector.properties
+++ b/docker/demo-config/MetadataFetcher_Connector.properties
@@ -1,2 +1,2 @@
-metadata.location.whitelist=http://localhost:7001/EidasNodeProxy/ServiceMetadata;http://localhost:8080/EidasNodeProxy/ServiceMetadata;http://localhost:8081/EidasNodeProxy/ServiceMetadata;http://localhost:8085/EidasNodeProxy/ServiceMetadata;http://localhost:9080/EidasNodeProxy/ServiceMetadata;http://eidas-demo-ca:8080/EidasNodeProxy/ServiceMetadata;http://eidas-demo-cb:8081/EidasNodeProxy/ServiceMetadata;http://eidas-proxy:8082/ServiceMetadata;https://eidas-demo-ca.idporten.dev/EidasNodeProxy/ServiceMetadata;https://eu-eidas-proxy.idporten.dev/ServiceMetadata
+metadata.location.whitelist=http://localhost:7001/EidasNodeProxy/ServiceMetadata;http://localhost:8080/EidasNodeProxy/ServiceMetadata;http://localhost:8081/EidasNodeProxy/ServiceMetadata;http://localhost:8085/EidasNodeProxy/ServiceMetadata;http://localhost:9080/EidasNodeProxy/ServiceMetadata;http://eidas-demo-ca:8080/EidasNodeProxy/ServiceMetadata;http://eidas-demo-cb:8081/EidasNodeProxy/ServiceMetadata;http://eidas-proxy:8082/ServiceMetadata;https://eidas-demo-ca.eidasnode.dev/EidasNodeProxy/ServiceMetadata;https://proxy.eidasnode.dev/ServiceMetadata
 metadata.location.whitelist.use=true
diff --git a/docker/demo-config/MetadataFetcher_Service.properties b/docker/demo-config/MetadataFetcher_Service.properties
index 17730fa..8cd13d6 100644
--- a/docker/demo-config/MetadataFetcher_Service.properties
+++ b/docker/demo-config/MetadataFetcher_Service.properties
@@ -15,5 +15,5 @@
 # See the Licence for the specific language governing permissions and
 # limitations under the Licence.
 #
-metadata.location.whitelist=http://localhost:7001/EidasNodeConnector/ConnectorMetadata;http://localhost:8080/EidasNodeConnector/ConnectorMetadata;http://localhost:8081/EidasNodeConnector/ConnectorMetadata;http://localhost:8085/EidasNodeConnector/ConnectorMetadata;http://localhost:9080/EidasNodeConnector/ConnectorMetadata;http://eidas-demo-ca:8080/EidasNodeConnector/ConnectorMetadata;http://eidas-demo-cb:8081/EidasNodeConnector/ConnectorMetadata;https://eidas-connector.idporten.dev/ConnectorMetadata;https://eidas-demo-ca.idporten.dev/EidasNodeConnector/ConnectorMetadata
+metadata.location.whitelist=http://localhost:7001/EidasNodeConnector/ConnectorMetadata;http://localhost:8080/EidasNodeConnector/ConnectorMetadata;http://localhost:8081/EidasNodeConnector/ConnectorMetadata;http://localhost:8085/EidasNodeConnector/ConnectorMetadata;http://localhost:9080/EidasNodeConnector/ConnectorMetadata;http://eidas-demo-ca:8080/EidasNodeConnector/ConnectorMetadata;http://eidas-demo-cb:8081/EidasNodeConnector/ConnectorMetadata;https://connector.eidasnode.dev/ConnectorMetadata;https://eidas-demo-ca.eidasnode.dev/EidasNodeConnector/ConnectorMetadata
 metadata.location.whitelist.use=true
\ No newline at end of file