diff --git a/nginx/1.13/Dockerfile b/nginx/1.13/Dockerfile
index 91ed638..1daea9f 100644
--- a/nginx/1.13/Dockerfile
+++ b/nginx/1.13/Dockerfile
@@ -1,12 +1,15 @@
 FROM nginx:1.13
 MAINTAINER Juan Alonso <juan.jalogut@gmail.com>
 
+ARG UID=1000
+ARG GID=1000
+
 RUN apt-get update \
 	&& apt-get install -y sudo \
 	&& rm -rf /var/lib/apt/lists/*
 
-RUN groupadd -g 1000 app \
- && useradd -g 1000 -u 1000 -d /var/www -s /bin/bash app
+RUN groupadd -g $GID app \
+ && useradd -g $GID -u $UID -d /var/www -s /bin/bash app
 RUN touch /var/run/nginx.pid
 RUN mkdir /sock
 RUN chown -R app:app /var/cache/nginx/ /var/run/nginx.pid /sock
diff --git a/node-php/node8-php7.1/Dockerfile b/node-php/node8-php7.1/Dockerfile
index b12ae37..cd64641 100644
--- a/node-php/node8-php7.1/Dockerfile
+++ b/node-php/node8-php7.1/Dockerfile
@@ -1,5 +1,8 @@
 FROM node:8
 
+ARG UID=1000
+ARG GID=1000
+
 RUN apt-get update -y
 RUN npm install -g grunt-cli && npm install -g bower
 
@@ -23,6 +26,9 @@ RUN apt-get update && \
         php7.1-pdo-mysql \
     && apt-get clean
 
+RUN usermod -u $UID app \
+    && groupmod -g $GID app
+
 RUN mkdir -p /home/app \
     && usermod -d /home/app -l app node \
     && chown -R app /home/app
diff --git a/php/7.1-fpm/Dockerfile b/php/7.1-fpm/Dockerfile
index 29a90b8..c562327 100644
--- a/php/7.1-fpm/Dockerfile
+++ b/php/7.1-fpm/Dockerfile
@@ -1,6 +1,9 @@
 FROM php:7.1-fpm
 MAINTAINER Fabio Righi <fabio@onestic.com>
 
+ARG UID=1000
+ARG GID=1000
+
 RUN apt-get update && apt-get install -y \
   cron \
   git \
@@ -60,8 +63,8 @@ RUN curl -sS -O https://files.magerun.net/n98-magerun2-latest.phar \
   && chmod +x ./n98-magerun2-latest.phar \
   && mv ./n98-magerun2-latest.phar /usr/local/bin/n98-magerun2
 
-RUN groupadd -g 1000 app \
-  && useradd -g 1000 -u 1000 -d /var/www -s /bin/bash app
+RUN groupadd -g $GID app \
+  && useradd -g $GID -u $UID -d /var/www -s /bin/bash app
 
 COPY conf/www.conf /usr/local/etc/php-fpm.d/
 COPY conf/php.ini /usr/local/etc/php/