diff --git a/Dockerfile b/Dockerfile
index 0aea6ce57..b0909143a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,8 +29,8 @@ WORKDIR /app/vikunja
 ENTRYPOINT [ "/sbin/tini", "-g", "--", "/entrypoint.sh" ]
 
 ENV VIKUNJA_SERVICE_ROOTPATH=/app/vikunja/
-ENV VIKUNJA_PUID 1000
-ENV VIKUNJA_PGID 1000
+ENV PUID 1000
+ENV PGID 1000
 
 RUN apk --update --no-cache add tzdata tini
 COPY docker/entrypoint.sh /entrypoint.sh
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index e234585d8..80b36656c 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/env sh
 set -e
 
-if [ -n "$VIKUNJA_PUID" ] && [ "$VIKUNJA_PUID" -ne 0 ] && \
-   [ -n "$VIKUNJA_PGID" ] && [ "$VIKUNJA_PGID" -ne 0 ] ; then
-  echo "info: creating the new user vikunja with $VIKUNJA_PUID:$VIKUNJA_PGID"
-  addgroup -g "$VIKUNJA_PGID" vikunja
-  adduser -s /bin/sh -D -G vikunja -u "$VIKUNJA_PUID" vikunja -h /app/vikunja -H
+if [ -n "$PUID" ] && [ "$PUID" -ne 0 ] && \
+   [ -n "$PGID" ] && [ "$PGID" -ne 0 ] ; then
+  echo "info: creating the new user vikunja with $PUID:$PGID"
+  addgroup -g "$PGID" vikunja
+  adduser -s /bin/sh -D -G vikunja -u "$PUID" vikunja -h /app/vikunja -H
   chown -R vikunja:vikunja ./
   su -pc /app/vikunja/vikunja - vikunja "$@"
 else