diff --git a/.env b/.env
index 4afc9d1c33ff7e6d855560c1cb8f56be6a635b99..d24f952dbb9c21ab359cf72544677922c1a826d9 100644
--- a/.env
+++ b/.env
@@ -1,8 +1,11 @@
-ENVIRONMENT=production # Environment to deploy to. Can be: development|production
+ENVIRONMENT=development # Environment to deploy to. Can be: development|production
+
 NODE_TAG=10
+COMPOSER_VERSION=2.6.5
 
 IMAGE_NAME=metagermaps
 IMAGE_TAG=dev
 
+# If you do not have user id 1000 on your local machine you can switch here to make sure permissions of dynamically created data match your current user
 USER_ID=1000   # User ID used in the Docker containers
 GROUP_ID=1000  # Group ID used in the Docker containers
\ No newline at end of file
diff --git a/build/fpm/Dockerfile b/build/fpm/Dockerfile
index 07d7ef8a4ea1cfe05a0c1c2658f16468a2052517..eceed7b8b40a6bdd2311f0b706b2701fe9d08290 100644
--- a/build/fpm/Dockerfile
+++ b/build/fpm/Dockerfile
@@ -41,6 +41,7 @@ EXPOSE 80
 
 FROM base as composer
 
+ARG COMPOSER_VERSION
 USER root
 
 WORKDIR /mgmaps
diff --git a/build/fpm/installComposer.sh b/build/fpm/installComposer.sh
index 6c531f88ab8d2489067fb4b44651402787b51695..4ae04aee140dc4fd7e5f4706762010e0afcbe43e 100644
--- a/build/fpm/installComposer.sh
+++ b/build/fpm/installComposer.sh
@@ -11,7 +11,7 @@ then
     exit 1
 fi
 
-php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=2.6.5
+php composer-setup.php --install-dir=/usr/local/bin --filename=composer --version=$COMPOSER_VERSION
 RESULT=$?
 rm composer-setup.php
 exit $RESULT
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index e233dc0dcb47f72c361d453492fc53e6e98ae7dc..422b2400e057061035bea36a0cee29079c2b3c68 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -48,7 +48,8 @@ services:
       args:
         USER: ${USER_ID}
         GROUP: ${GROUP_ID}
-    image: ${IMAGE_NAME}/composer:${IMAGE_TAG}
+        COMPOSER_VERSION: ${COMPOSER_VERSION}
+    image: ${IMAGE_NAME}/composer:${COMPOSER_VERSION}
     volumes:
       - ./app:/html
       - composer-cache:/mgmaps/.composer