diff --git a/scripts/provision.sh b/scripts/provision.sh
index 96dfb1eaa89aebda14492dd66121648e61bc8451..d5e71082ee7c7384d7971114801220c3e25c0d23 100755
--- a/scripts/provision.sh
+++ b/scripts/provision.sh
@@ -86,7 +86,7 @@ function scaffold () {
   fi
 
   info "Creating application folder"
-  mkdir -p ${FOLDER}
+  mkdir -p ${APP_FOLDER}
 
   info "Creating .env"
   echo "EMAIL=${arg_e}" > ${FOLDER}/.env
@@ -96,6 +96,7 @@ function scaffold () {
     echo DOCKER_ARGUMENTS="-v ${APP_FOLDER}/www-content:/app" >> ${FOLDER}/.env
     ;;
   "wordpress" )
+    touch ${APP_FOLDER}/.htaccess
     echo APPLICATION=${arg_a} >> ${FOLDER}/.env
     echo DOCKER_ARGUMENTS="--link mysql-${arg_u}:db \
       -v ${APP_FOLDER}/data:/app/wp-content \
@@ -103,6 +104,7 @@ function scaffold () {
       --env-file ${APP_FOLDER}/.env" >> ${FOLDER}/.env
     ;;
   "known" )
+    touch ${APP_FOLDER}/.htaccess
     echo APPLICATION=${arg_a} >> ${FOLDER}/.env
     echo DOCKER_ARGUMENTS="--link mysql-${arg_u}:db \
       -v ${APP_FOLDER}/data:/app/Uploads \
diff --git a/unit-files/lamp@.service b/unit-files/lamp@.service
index cdbe6ae4fac45ac7dec3ed2a82387c36e3c17154..71afd9373295a10ec1849e92cf36585099a1dcde 100644
--- a/unit-files/lamp@.service
+++ b/unit-files/lamp@.service
@@ -18,9 +18,7 @@ RemainAfterExit=yes
 EnvironmentFile=/data/domains/%i/.env
 ExecStart=/bin/bash -euxc ' \
   application_folder=/data/domains/%i/${APPLICATION}; \
-  if [ ! -d $application_folder ]; then \
-    mkdir -p $application_folder; \
-    touch $application_folder/.htaccess; \
+  if [ ! -f $application_folder/.env ]; then \
     cat /data/domains/%i/mysql/.env | sed s/MYSQL_PASS/DB_PASS/ > $application_folder/.env; \
   fi;'