diff --git a/eidas-proxy/overlay/etc/eidas-proxy/xy/cfg/application.properties b/eidas-proxy/overlay/etc/eidas-proxy/xy/cfg/application.properties
index ee4528d9..b09944c4 100644
--- a/eidas-proxy/overlay/etc/eidas-proxy/xy/cfg/application.properties
+++ b/eidas-proxy/overlay/etc/eidas-proxy/xy/cfg/application.properties
@@ -4,7 +4,8 @@ logging.level.org.springframework.web=INFO
 # Service path
 server.context-path=/eidas-ps
 
-proxy-service.path.prefix=${proxy-service.path.location}/cfg/
+proxy-service.path.prefix=${spring.config.location}..
+proxy-service.config.location=file://${spring.config.location}
 
 # Service port connector settings
 server.port=8443
@@ -32,7 +33,7 @@ proxy-service.daemon.recache.delay.sec=240
 # 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.keyStoreLocation=${proxy-service.path.location}/nodeKeyStore.jks
+proxy-service.keyStoreLocation=${proxy-service.path.prefix}/nodeKeyStore.jks
 proxy-service.keyStorePass=local-demo
 proxy-service.keyStoreAlias=local-demo-cert
 
@@ -49,7 +50,7 @@ proxy-service.consent.attributes=urn:oid:1.2.752.201.3.7,\
 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.location}/cfg/infotext.md
+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