diff --git a/docker/develop/entrypoint.sh b/docker/develop/entrypoint.sh
index 2f498a8e4..b32bb35f8 100755
--- a/docker/develop/entrypoint.sh
+++ b/docker/develop/entrypoint.sh
@@ -32,16 +32,22 @@ fi
 
 # Script runs as root?
 if [[ $(id -u) == "0" ]]; then
-  # Legacy user ID env variable in use?
-  if [[ -z ${PHOTOPRISM_UID} ]] && [[ ${UID} =~ $re ]] && [[ ${UID} != "0" ]]; then
-    PHOTOPRISM_UID=${UID}
-    echo "WARNING: UID without PHOTOPRISM_ prefix is deprecated, use PHOTOPRISM_UID: \"${PHOTOPRISM_UID}\" instead"
+  # Alternate USER ID environment variable check
+  if [[ -z ${PHOTOPRISM_UID} ]]; then
+    if [[ ${UID} =~ $re ]] && [[ ${UID} != "0" ]]; then
+      PHOTOPRISM_UID=${UID}
+    elif [[ ${PUID} =~ $re ]] && [[ ${PUID} != "0" ]]; then
+      PHOTOPRISM_UID=${PUID}
+    fi
   fi
 
-  # Legacy group ID env variable in use?
-  if [[ -z ${PHOTOPRISM_GID} ]] && [[ ${GID} =~ $re ]] && [[ ${GID} != "0" ]]; then
-    PHOTOPRISM_GID=${GID}
-    echo "WARNING: GID without PHOTOPRISM_ prefix is deprecated, use PHOTOPRISM_GID: \"${PHOTOPRISM_GID}\" instead"
+  # Alternate GROUP ID environment variable check
+  if [[ -z ${PHOTOPRISM_GID} ]]; then
+    if [[ ${GID} =~ $re ]] && [[ ${GID} != "0" ]]; then
+      PHOTOPRISM_GID=${GID}
+    elif [[ ${PGID} =~ $re ]] && [[ ${PGID} != "0" ]]; then
+      PHOTOPRISM_GID=${PGID}
+    fi
   fi
 
   # User and group ID set?
diff --git a/docker/photoprism/entrypoint.sh b/docker/photoprism/entrypoint.sh
index d6099e56a..4b3a5218d 100755
--- a/docker/photoprism/entrypoint.sh
+++ b/docker/photoprism/entrypoint.sh
@@ -30,16 +30,22 @@ fi
 
 # Script runs as root?
 if [[ $(id -u) == "0" ]]; then
-  # Legacy user ID env variable in use?
-  if [[ -z ${PHOTOPRISM_UID} ]] && [[ ${UID} =~ $re ]] && [[ ${UID} != "0" ]]; then
-    PHOTOPRISM_UID=${UID}
-    echo "WARNING: UID without PHOTOPRISM_ prefix is deprecated, use PHOTOPRISM_UID: \"${PHOTOPRISM_UID}\" instead"
+  # Alternate USER ID environment variable check
+  if [[ -z ${PHOTOPRISM_UID} ]]; then
+    if [[ ${UID} =~ $re ]] && [[ ${UID} != "0" ]]; then
+      PHOTOPRISM_UID=${UID}
+    elif [[ ${PUID} =~ $re ]] && [[ ${PUID} != "0" ]]; then
+      PHOTOPRISM_UID=${PUID}
+    fi
   fi
 
-  # Legacy group ID env variable in use?
-  if [[ -z ${PHOTOPRISM_GID} ]] && [[ ${GID} =~ $re ]] && [[ ${GID} != "0" ]]; then
-    PHOTOPRISM_GID=${GID}
-    echo "WARNING: GID without PHOTOPRISM_ prefix is deprecated, use PHOTOPRISM_GID: \"${PHOTOPRISM_GID}\" instead"
+  # Alternate GROUP ID environment variable check
+  if [[ -z ${PHOTOPRISM_GID} ]]; then
+    if [[ ${GID} =~ $re ]] && [[ ${GID} != "0" ]]; then
+      PHOTOPRISM_GID=${GID}
+    elif [[ ${PGID} =~ $re ]] && [[ ${PGID} != "0" ]]; then
+      PHOTOPRISM_GID=${PGID}
+    fi
   fi
 
   # User and group ID set?