diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
index 155dca2..2e55058 100644
--- a/deploy/docker-compose.yml
+++ b/deploy/docker-compose.yml
@@ -43,9 +43,9 @@ services:
       - appfactory
 
   appfactory-webhook:
-    user: "1000:1000"
+    user: "${APPFACTORY_UID}:${APPFACTORY_GID}"
     group_add:
-      - "974"
+      - "${APPFACTORY_DOCKER_GID}"
     image: appfactory-webhook:latest
     container_name: appfactory-webhook
     restart: unless-stopped
@@ -64,9 +64,9 @@ services:
       - appfactory
 
   appfactory-portal:
-    user: "1000:1000"
+    user: "${APPFACTORY_UID}:${APPFACTORY_GID}"
     group_add:
-      - "974"
+      - "${APPFACTORY_DOCKER_GID}"
     image: appfactory-portal:latest
     container_name: appfactory-portal
     restart: unless-stopped
@@ -87,9 +87,9 @@ services:
       - appfactory
 
   appfactory-worker:
-    user: "1000:1000"
+    user: "${APPFACTORY_UID}:${APPFACTORY_GID}"
     group_add:
-      - "974"
+      - "${APPFACTORY_DOCKER_GID}"
     image: appfactory-worker:latest
     container_name: appfactory-worker
     restart: unless-stopped
@@ -108,7 +108,7 @@ services:
       - appfactory
 
   appfactory-monitor:
-    user: "1000:1000"
+    user: "${APPFACTORY_UID}:${APPFACTORY_GID}"
     image: appfactory-monitor:latest
     container_name: appfactory-monitor
     restart: unless-stopped