diff --git a/demw-1.test.sveidas.se/overlay/etc/luna/client/.placeholder b/demw-1.test.sveidas.se/overlay/etc/luna/cert/client/.placeholder
similarity index 100%
rename from demw-1.test.sveidas.se/overlay/etc/luna/client/.placeholder
rename to demw-1.test.sveidas.se/overlay/etc/luna/cert/client/.placeholder
diff --git a/demw-1.test.sveidas.se/overlay/etc/luna/server/CAFile.pem b/demw-1.test.sveidas.se/overlay/etc/luna/cert/server/CAFile.pem
similarity index 100%
rename from demw-1.test.sveidas.se/overlay/etc/luna/server/CAFile.pem
rename to demw-1.test.sveidas.se/overlay/etc/luna/cert/server/CAFile.pem
diff --git a/demw-1.test.sveidas.se/overlay/etc/luna/server/tug-hsm-lab2.sunet.seCert.pem b/demw-1.test.sveidas.se/overlay/etc/luna/cert/server/tug-hsm-lab2.sunet.seCert.pem
similarity index 100%
rename from demw-1.test.sveidas.se/overlay/etc/luna/server/tug-hsm-lab2.sunet.seCert.pem
rename to demw-1.test.sveidas.se/overlay/etc/luna/cert/server/tug-hsm-lab2.sunet.seCert.pem
diff --git a/demw-1.test.sveidas.se/overlay/opt/eidas-middleware/configuration/application.properties.sh b/demw-1.test.sveidas.se/overlay/opt/eidas-middleware/configuration/application.properties.sh
index dd77cd14..63fccbb9 100644
--- a/demw-1.test.sveidas.se/overlay/opt/eidas-middleware/configuration/application.properties.sh
+++ b/demw-1.test.sveidas.se/overlay/opt/eidas-middleware/configuration/application.properties.sh
@@ -1,27 +1,26 @@
 cat<<EOF
-#Logging
-logging.file=/var/log/eidas-middleware/demw.log
-#logging.level.com.zaxxer.hikari=DEBUG
-
-#Credentials
-poseidas.admin.hashed.password=${POSEIDAS_ADMIN_HASHED_PASSWORD}
-poseidas.admin.username=${POSEIDAS_ADMIN_USERNAME:-demw}
-
-#Server Settings
 server.port=${SERVER_PORT:-8443}
 server.adminInterfacePort=${ADMIN_PORT:-10000}
-server.ssl.key-password=dummy
-server.ssl.key-store=file\:///tmp/${CERTNAME}.p12
-server.ssl.key-store-password=dummy
-server.ssl.keyAlias=tls
-server.ssl.keyStoreType=PKCS12
 
-#Data source
-spring.datasource.password=${SPRING_DATASOURCE_PASSWORD}
-spring.datasource.url=jdbc\:h2\:file\:/opt/eidas-middleware/database/eidasmw;DB_CLOSE_DELAY\=-1;DB_CLOSE_ON_EXIT\=FALSE
+#TLS settings
+server.ssl.key-store:file:file\:///tmp/${CERTNAME}.p12
+server.ssl.key-store-password:dummy
+server.ssl.key-password=dummy
+server.ssl.keyStoreType:PKCS12
+server.ssl.keyAlias:tls
+
+#database connection
+spring.datasource.url=jdbc:h2:/opt/eidas-middleware/database/eidasmw;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE
 spring.datasource.username=${SPRING_DATASOURCE_USERNAME:-demw}
-spring.datasource.hikari.maximumPoolSize=20
+spring.datasource.password=${SPRING_DATASOURCE_PASSWORD}
+
+#logging
+logging.file.name=/var/log/eidas-middleware/eidas-middleware.log
 
 #HSM
 hsm.type=NO_HSM
+#hsm.keys.delete=30
+#hsm.keys.archive=false
+#pkcs11.config=
+#pkcs11.passwd=123456
 EOF