diff --git a/.docker/php-fpm/Dockerfile b/.docker/php-fpm/Dockerfile
index 5403e29a1..60fc00fe1 100644
--- a/.docker/php-fpm/Dockerfile
+++ b/.docker/php-fpm/Dockerfile
@@ -7,4 +7,13 @@ RUN chmod +x /usr/local/bin/install-php-extensions && \
 
 RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer
 
+ARG CURRENT_UID=1000
+ENV CURRENT_UID ${CURRENT_UID}
+ARG CURRENT_GID=1000
+ENV CURRENT_GID ${CURRENT_GID}
+
+RUN apk --no-cache add shadow && \
+    groupmod -o -g ${CURRENT_GID} www-data && \
+    usermod -o -u ${CURRENT_UID} -g www-data www-data
+
 WORKDIR /app
diff --git a/Makefile b/Makefile
index 63796a162..fb767f3d6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,14 @@
 prepare:
 	cp -R ./system/vendor/maximebf/debugbar/src/DebugBar/Resources/* themes/default/assets/debugbar
 
+SHELL=/bin/bash
+
+CURRENT_UID := $(shell id -u)
+CURRENT_GID := $(shell id -g)
+
+export CURRENT_UID
+export CURRENT_GID
+
 cms-install:
 	composer install
 	npm install
diff --git a/docker-compose.yml b/docker-compose.yml
index 36f1e055c..317fe66df 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,6 +18,9 @@ services:
     container_name: php-fpm.${APP_NAMESPACE:-johncms}
     depends_on:
       - mariadb
+    environment:
+      CURRENT_UID: ${CURRENT_UID:-1000}
+      CURRENT_GID: ${CURRENT_GID:-1000}
     volumes:
       - .:/app
       - ./.docker/php-fpm/php.ini:/usr/local/etc/php/php.ini