diff --git a/workspace/Dockerfile-56 b/workspace/Dockerfile-56
index 701aa9e0..a306ae03 100644
--- a/workspace/Dockerfile-56
+++ b/workspace/Dockerfile-56
@@ -46,8 +46,12 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 # Add a non-root user to prevent files being created with root permissions on host machine.
 ARG PUID=1000
 ARG PGID=1000
-RUN groupadd -g $PGID laradock && \
-    useradd -u $PUID -g laradock -m laradock && \
+
+ENV PUID ${PUID}
+ENV PGID ${PGID}
+
+RUN groupadd -g ${PGID} laradock && \
+    useradd -u ${PUID} -g laradock -m laradock && \
     apt-get update -yqq
 
 #####################################
diff --git a/workspace/Dockerfile-70 b/workspace/Dockerfile-70
index b4607580..82c76a55 100644
--- a/workspace/Dockerfile-70
+++ b/workspace/Dockerfile-70
@@ -46,8 +46,12 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 # Add a non-root user to prevent files being created with root permissions on host machine.
 ARG PUID=1000
 ARG PGID=1000
-RUN groupadd -g $PGID laradock && \
-    useradd -u $PUID -g laradock -m laradock && \
+
+ENV PUID ${PUID}
+ENV PGID ${PGID}
+
+RUN groupadd -g ${PGID} laradock && \
+    useradd -u ${PUID} -g laradock -m laradock && \
     apt-get update -yqq
 
 #####################################
diff --git a/workspace/Dockerfile-71 b/workspace/Dockerfile-71
index 8efc74c1..b01ce514 100644
--- a/workspace/Dockerfile-71
+++ b/workspace/Dockerfile-71
@@ -46,8 +46,12 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 # Add a non-root user to prevent files being created with root permissions on host machine.
 ARG PUID=1000
 ARG PGID=1000
-RUN groupadd -g $PGID laradock && \
-    useradd -u $PUID -g laradock -m laradock && \
+
+ENV PUID ${PUID}
+ENV PGID ${PGID}
+
+RUN groupadd -g ${PGID} laradock && \
+    useradd -u ${PUID} -g laradock -m laradock && \
     apt-get update -yqq
 
 #####################################