diff --git a/Dockerfile b/Dockerfile
index ead3f181d..088bf8b79 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,7 +25,12 @@ WORKDIR /app/tests
 CMD ["/app/vendor/phpunit/phpunit/phpunit"]
 
 FROM ospos AS ospos_dev
-RUN addgroup -S $GID && adduser -S $UID -G $GID
+
+ARG USERID
+ARG GROUPID
+
+RUN echo "Adding user uid $USERID with gid $GROUPID"
+RUN ( addgroup --gid $GROUPID ospos || true ) && ( adduser --uid $USERID --gid $GROUPID ospos )
 
 RUN yes | pecl install xdebug \
     && echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > /usr/local/etc/php/conf.d/xdebug.ini \
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 94d886f9f..565c3a727 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -7,8 +7,8 @@ services:
         build:
             context: .
             args:
-              - UID=${USERID}
-              - GID=${GROUPID}
+              - USERID=${USERID}
+              - GROUPID=${GROUPID}
             target: ospos_dev
         container_name: ospos_dev
         restart: always