diff --git a/Dockerfile b/Dockerfile
index 01cef9e5efbefe72069dab2a290b5ab27e0a1ded..0cb553aba9a93a2a281919421ca0a8b13683477d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,8 @@ MAINTAINER nmaas@lists.geant.org
 
 COPY --from=builder /build/build/libs/*.jar /nmaas/platform/
 COPY docker/run_platform.sh /nmaas/scripts/run_platform.sh
-COPY docker/nmaas-platform.properties.template /nmaas/platform/config/nmaas-platform.properties.template
+# COPY docker/nmaas-platform.properties.template /nmaas/platform/config/nmaas-platform.properties.template
+COPY src/main/resources/application.properties /nmaas/platform/config/application.properties
 COPY docker/log4j2-spring.json /nmaas/platform/config/log4j2-spring.json
 COPY docker/do-ntp.sh /etc/periodic/hourly/do-ntp.sh
 COPY docker/ssh-config /root/.ssh/config
diff --git a/docker/run_platform.sh b/docker/run_platform.sh
index 440f7965465c9a20e000f7e9d62eaad03afc26e0..d0b6dd8ffb58695438ceb777bd347c2de332f32e 100644
--- a/docker/run_platform.sh
+++ b/docker/run_platform.sh
@@ -4,9 +4,9 @@ FILE=$(ls $DIR | grep .jar)
 cd $DIR
 
 if [[ -z "${PLATFORM_PORT}" ]]; then
-  cp $DIR/config/nmaas-platform.properties.default $DIR/nmaas-platform.properties
+  cp $DIR/config/application.properties $DIR/nmaas-platform.properties
 else
-  envsubst < $DIR/config/nmaas-platform.properties.template > $DIR/nmaas-platform.properties
+  envsubst < $DIR/config/application.properties > $DIR/nmaas-platform.properties
 fi
 
 mkdir -p /root/.ssh