diff --git a/Dockerfile b/Dockerfile
index 7fca95c..be9af25 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -40,7 +40,8 @@ RUN set -x \
         --delete               "Server/Service/Engine/Host/Context/@debug" \
                                "${CONF_INSTALL}/conf/server.xml" \
     && touch -d "@0"           "${CONF_INSTALL}/conf/server.xml" \
-    && chown daemon:daemon     "${JAVA_CACERTS}"
+    && chown daemon:daemon     "${JAVA_CACERTS}" \
+    && usermod -d	       "${CONF_HOME}" daemon
 
 # Use the default unprivileged account. This could be considered bad practice
 # on systems where multiple processes end up being executed by 'daemon' but
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 1ad2377..b5aa36b 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -25,5 +25,4 @@ if [ -f "${CERTIFICATE}" ]; then
   keytool -noprompt -storepass changeit -keystore ${JAVA_CACERTS} -import -file ${CERTIFICATE} -alias CompanyCA
 fi
 
-
 exec "$@"