diff --git a/Dockerfile b/Dockerfile
index e3782e993209c9c04eafa3590a8b49cbd73ea17d..79d396c86140664a418ac29ea71400873db2db0e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,9 +2,8 @@
 FROM python:3.10-slim as base
 LABEL maintainer="David Trattnig <david.trattnig@subsquare.at>"
 
-ENV UID=1000
-ENV GID=1000
-ENV USER=app
+ENV AURA_UID=2872
+ENV AURA_GID=2872
 
 # Configure Poetry
 ENV POETRY_VERSION=1.3.2
@@ -37,9 +36,9 @@ COPY config/sample.engine.docker.ini /srv/config/engine.ini
 RUN poetry install --no-interaction --no-ansi
 
 # Update Permissions
-RUN set -e \
-      && adduser --home /srv --no-create-home --system --uid ${UID} --group ${USER} \
-      && chown -R ${UID}:${GID} /srv /etc/aura /var/audio
+RUN groupadd --gid ${AURA_GID} aura && \
+      useradd --gid ${AURA_GID} --no-user-group --uid ${AURA_UID} --home-dir /srv --no-create-home aura && \
+      chown -R ${AURA_UID}:${AURA_GID} /srv /etc/aura /var/audio
 
 ENTRYPOINT ["make"]
 CMD ["run"]
diff --git a/Makefile b/Makefile
index 9bf15d0200715961a2fb300ed68228e4085ae343..b3480e23e9b5715a2938ce72eed63197426db1fe 100644
--- a/Makefile
+++ b/Makefile
@@ -19,12 +19,15 @@ help::
 
 # Settings
 
+TIMEZONE := "Europe/Vienna"
+
 AURA_ENGINE_CORE_SOCKET := "aura_engine_socket"
 AURA_ENGINE_CONFIG := ${CURDIR}/config/engine.docker.ini
 AURA_AUDIO_STORE_SOURCE := ${CURDIR}/../engine-core/audio/source
 AURA_AUDIO_STORE_PLAYLIST := ${CURDIR}/../engine-core/audio/playlist
 AURA_LOGS := ${CURDIR}/logs
-TIMEZONE := "Europe/Vienna"
+AURA_UID := 2872
+AURA_GID := 2872
 
 DOCKER_RUN = @docker run \
 		--name $(APP_NAME) \
@@ -36,7 +39,7 @@ DOCKER_RUN = @docker run \
 		-v "$(AURA_AUDIO_STORE_SOURCE)":"/var/audio/source":ro \
 		-v "$(AURA_AUDIO_STORE_PLAYLIST)":"/var/audio/playlist":ro \
 		-v "$(AURA_LOGS)":"/srv/logs" \
-		-u $(UID):$(GID) \
+		-u $(AURA_UID):$(AURA_GID) \
 		$(DOCKER_ENTRY_POINT) \
 		autoradio/$(APP_NAME)