diff --git a/7/Dockerfile.apache-alpine b/7/Dockerfile.apache-alpine
index 1275a0e..d2c5701 100644
--- a/7/Dockerfile.apache-alpine
+++ b/7/Dockerfile.apache-alpine
@@ -33,7 +33,7 @@ RUN /bin/mkdir -p /app ; \
               php${PHP_VER_SHORT} php${PHP_VER_SHORT}-common \
               php${PHP_VER_SHORT}-cli php${PHP_VER_SHORT}-phar \
               php${PHP_VER_SHORT}-iconv php${PHP_VER_SHORT}-mbstring ; \
-    /bin/chmod +x /tmp/setup.sh /usr/local/bin/entrypoint.sh /usr/local/bin/composer;  \
+    /bin/chmod +rx /tmp/setup.sh /usr/local/bin/entrypoint.sh /usr/local/bin/composer;  \
     /bin/sh /tmp/setup.sh; \
     /bin/rm -f /tmp/*.sh; 
 
diff --git a/7/scripts/alpine-setup.sh b/7/scripts/alpine-setup.sh
index fd69074..e9b33bf 100644
--- a/7/scripts/alpine-setup.sh
+++ b/7/scripts/alpine-setup.sh
@@ -16,7 +16,7 @@ APP_ROOT="$SERVER_ROOT/htdocs"
 LOG_LEVEL="info"
 
 /usr/sbin/addgroup -g 10000 php ;
-/usr/sbin/adduser -D -u 10000 -G php -s /bin/sh -h $APP_ROOT php ;
+/usr/sbin/adduser -D -u 10000 -G php -s /bin/sh -h $SERVER_ROOT php ;
 
 # Setup php flavor
 if [[ "$FLAVOR" == "debug" ]]; then