diff --git a/docker/develop/entrypoint.sh b/docker/develop/entrypoint.sh
index c8caa16f7..0669b753f 100755
--- a/docker/develop/entrypoint.sh
+++ b/docker/develop/entrypoint.sh
@@ -20,8 +20,6 @@ else
   echo "started as uid $(id -u)"
 fi
 
-STORAGE_PATH=${PHOTOPRISM_STORAGE_PATH:-/go/src/github.com/photoprism/photoprism/storage}
-
 re='^[0-9]+$'
 
 # check for alternate umask variable
@@ -58,16 +56,17 @@ if [[ $(id -u) == "0" ]]; then
     fi
   fi
 
-  # create missing user/group if needed
+  # check uid and gid env variables
   if [[ ${PHOTOPRISM_UID} =~ $re ]] && [[ ${PHOTOPRISM_UID} != "0" ]] && [[ ${PHOTOPRISM_GID} =~ $re ]] && [[ ${PHOTOPRISM_GID} != "0" ]]; then
+    # RUN AS SPECIFIED USER + GROUP ID
     groupadd -g "${PHOTOPRISM_GID}" "group_${PHOTOPRISM_GID}" 2>/dev/null
     useradd -o -u "${PHOTOPRISM_UID}" -g "${PHOTOPRISM_GID}" -d /photoprism "user_${PHOTOPRISM_UID}" 2>/dev/null
     usermod -g "${PHOTOPRISM_GID}" "user_${PHOTOPRISM_UID}" 2>/dev/null
 
     if [[ -z ${PHOTOPRISM_DISABLE_CHOWN} ]]; then
       echo "updating storage permissions..."
-      chown --preserve-root -Rf "${PHOTOPRISM_UID}:${PHOTOPRISM_GID}" /go /photoprism /tmp/photoprism /opt/photoprism
-      chmod --preserve-root -Rf u+rwX "${STORAGE_PATH}"
+      chown --preserve-root -Rcf "${PHOTOPRISM_UID}:${PHOTOPRISM_GID}" /go /photoprism /opt/photoprism /tmp/photoprism
+      chmod --preserve-root -Rcf u+rwX /go/src/github.com/photoprism/photoprism/* /photoprism /opt/photoprism /tmp/photoprism
       echo "PHOTOPRISM_DISABLE_CHOWN: \"true\" disables storage permission updates"
     fi
 
@@ -76,14 +75,14 @@ if [[ $(id -u) == "0" ]]; then
 
     gosu "${PHOTOPRISM_UID}:${PHOTOPRISM_GID}" "$@" &
   elif [[ ${PHOTOPRISM_UID} =~ $re ]] && [[ ${PHOTOPRISM_UID} != "0" ]]; then
-    # user ID only
+    # RUN AS SPECIFIED USER ID
     useradd -o -u "${PHOTOPRISM_UID}" -g 1000 -d /photoprism "user_${PHOTOPRISM_UID}" 2>/dev/null
     usermod -g 1000 "user_${PHOTOPRISM_UID}" 2>/dev/null
 
     if [[ -z ${PHOTOPRISM_DISABLE_CHOWN} ]]; then
       echo "updating storage permissions..."
-      chown --preserve-root -Rf "${PHOTOPRISM_UID}" /go /photoprism /tmp/photoprism /opt/photoprism
-      chmod --preserve-root -Rf u+rwX "${STORAGE_PATH}"
+      chown --preserve-root -Rcf "${PHOTOPRISM_UID}" /go /photoprism /opt/photoprism /tmp/photoprism
+      chmod --preserve-root -Rcf u+rwX /go/src/github.com/photoprism/photoprism/* /photoprism /opt/photoprism /tmp/photoprism
       echo "PHOTOPRISM_DISABLE_CHOWN: \"true\" disables storage permission updates"
     fi
 
@@ -92,14 +91,14 @@ if [[ $(id -u) == "0" ]]; then
 
     gosu "${PHOTOPRISM_UID}" "$@" &
   else
-    # run as root
+    # RUN AS ROOT
     echo "running as root"
     echo "${@}"
 
     "$@" &
   fi
 else
-  # running as user
+  # RUN AS NON-ROOT USER
   echo "running as uid $(id -u)"
   echo "${@}"
 
diff --git a/scripts/dist/entrypoint.sh b/scripts/dist/entrypoint.sh
index ac744c83f..dfa44cb4d 100755
--- a/scripts/dist/entrypoint.sh
+++ b/scripts/dist/entrypoint.sh
@@ -20,8 +20,6 @@ else
   echo "started as uid $(id -u)"
 fi
 
-STORAGE_PATH=${PHOTOPRISM_STORAGE_PATH:-/photoprism/storage}
-
 re='^[0-9]+$'
 
 # check for alternate umask variable
@@ -58,16 +56,17 @@ if [[ $(id -u) == "0" ]]; then
     fi
   fi
 
-  # create missing user/group if needed
+  # check uid and gid env variables
   if [[ ${PHOTOPRISM_UID} =~ $re ]] && [[ ${PHOTOPRISM_UID} != "0" ]] && [[ ${PHOTOPRISM_GID} =~ $re ]] && [[ ${PHOTOPRISM_GID} != "0" ]]; then
+    # RUN AS SPECIFIED USER + GROUP ID
     groupadd -g "${PHOTOPRISM_GID}" "group_${PHOTOPRISM_GID}" 2>/dev/null
     useradd -o -u "${PHOTOPRISM_UID}" -g "${PHOTOPRISM_GID}" -d /photoprism "user_${PHOTOPRISM_UID}" 2>/dev/null
     usermod -g "${PHOTOPRISM_GID}" "user_${PHOTOPRISM_UID}" 2>/dev/null
 
     if [[ -z ${PHOTOPRISM_DISABLE_CHOWN} ]]; then
       echo "updating storage permissions..."
-      chown --preserve-root -Rf "${PHOTOPRISM_UID}:${PHOTOPRISM_GID}" /photoprism
-      chmod --preserve-root -Rf u+rwX "${STORAGE_PATH}"
+      chown --preserve-root -Rcf "${PHOTOPRISM_UID}:${PHOTOPRISM_GID}" /photoprism /opt/photoprism
+      chmod --preserve-root -Rcf u+rwX /photoprism /opt/photoprism
       echo "PHOTOPRISM_DISABLE_CHOWN: \"true\" disables storage permission updates"
     fi
 
@@ -76,14 +75,14 @@ if [[ $(id -u) == "0" ]]; then
 
     gosu "${PHOTOPRISM_UID}:${PHOTOPRISM_GID}" audit.sh && gosu "${PHOTOPRISM_UID}:${PHOTOPRISM_GID}" "$@" &
   elif [[ ${PHOTOPRISM_UID} =~ $re ]] && [[ ${PHOTOPRISM_UID} != "0" ]]; then
-    # user ID only
+    # RUN AS SPECIFIED USER ID
     useradd -o -u "${PHOTOPRISM_UID}" -g 1000 -d /photoprism "user_${PHOTOPRISM_UID}" 2>/dev/null
     usermod -g 1000 "user_${PHOTOPRISM_UID}" 2>/dev/null
 
     if [[ -z ${PHOTOPRISM_DISABLE_CHOWN} ]]; then
       echo "updating storage permissions..."
-      chown --preserve-root -Rf "${PHOTOPRISM_UID}" /photoprism
-      chmod --preserve-root -Rf u+rwX "${STORAGE_PATH}"
+      chown --preserve-root -Rcf "${PHOTOPRISM_UID}" /photoprism /opt/photoprism
+      chmod --preserve-root -Rcf u+rwX /photoprism /opt/photoprism
       echo "PHOTOPRISM_DISABLE_CHOWN: \"true\" disables storage permission updates"
     fi
 
@@ -92,15 +91,14 @@ if [[ $(id -u) == "0" ]]; then
 
     gosu "${PHOTOPRISM_UID}" audit.sh && gosu "${PHOTOPRISM_UID}" "$@" &
   else
-    # no user or group ID set via end variable
+    # RUN AS ROOT
     echo "running as root"
     echo "${@}"
 
     audit.sh && "$@" &
   fi
 else
-
-  # running as root
+  # RUN AS NON-ROOT USER
   echo "running as uid $(id -u)"
   echo "${@}"