diff --git a/scripts/deploy-core-service.sh b/scripts/deploy-core-service.sh
index fa051d6..ad9dac8 100755
--- a/scripts/deploy-core-service.sh
+++ b/scripts/deploy-core-service.sh
@@ -17,6 +17,15 @@ set +a
 export DOCKER_CONFIG="/tmp/.docker"
 mkdir -p "$DOCKER_CONFIG"
 
+export APPFACTORY_UID="${APPFACTORY_UID:-$(id -u)}"
+export APPFACTORY_GID="${APPFACTORY_GID:-$(id -g)}"
+export APPFACTORY_DOCKER_GID="${APPFACTORY_DOCKER_GID:-$(getent group docker | cut -d: -f3)}"
+
+if [ -z "$APPFACTORY_DOCKER_GID" ]; then
+  echo "Missing docker group. Cannot resolve APPFACTORY_DOCKER_GID."
+  exit 1
+fi
+
 DB_FILE="/opt/appfactory/data/appfactory/appfactory.db"
 SERVICE_DIR="$WORKSPACE_DIR/$SERVICE_NAME"
 DEPLOY_DIR="$APPFACTORY_DIR/deploy"