diff --git a/Makefile.example b/Makefile.example
index 7fe3406..c61bed4 100644
--- a/Makefile.example
+++ b/Makefile.example
@@ -11,6 +11,9 @@ status: ## Show status of containers
 up: ## Start all or c=<name> containers in foreground
 	@$(DOCKER_COMPOSE) -f $(DOCKER_COMPOSE_FILE) --env-file $(ENV_FILE) up $(c)
 
+shell: ## Start all or c=<name> containers in foreground
+	@$(DOCKER_COMPOSE) -f $(DOCKER_COMPOSE_FILE) --env-file $(ENV_FILE) exec $(c) $(sh)
+
 start: ## Start all or c=<name> containers in background
 	@$(DOCKER_COMPOSE) -f $(DOCKER_COMPOSE_FILE) --env-file $(ENV_FILE) up -d $(c)
 
diff --git a/docker-compose.dist.yml b/docker-compose.dist.yml
index 6568a48..0237c6f 100644
--- a/docker-compose.dist.yml
+++ b/docker-compose.dist.yml
@@ -10,8 +10,10 @@ services:
     ports:
       - ${NGINX_PORT}:80
     volumes:
+      - ./docker/nginx/templates:/etc/nginx/templates
       - ${PROJECT_DIR}:/var/www
-      - ./docker/nginx/default:/etc/nginx/conf.d/default.conf
+    environment:
+      WEB_ROOT: ${WEB_ROOT}
 
   phpfpm:
     build: ./docker/php-fpm/
@@ -23,6 +25,10 @@ services:
       - ./docker/php-fpm/xdebug.ini:/etc/php/7.4/mods-available/xdebug.ini
       - ./docker/php-fpm/supervisor.conf:/etc/supervisor/supervisor_nodeamon.conf
       - ./docker/imagick/policy.xml:/etc/ImageMagick-6/policy.xml
+      # One can add any configuration overrides.
+      # Just put them under ./docker/userconfigs/
+      # and map as following
+      # - ./docker/userconfigs/supervisor/conf.d:/etc/supervisor/conf.d
 
   postgres:
     image: postgis/postgis:12-master
@@ -76,16 +82,18 @@ services:
       - ./mysql-latest:/etc/mysql/conf.d
 
   rabbitmq:
-    image: rabbitmq:3-management
+    image: rabbitmq:management-alpine
     container_name: rabbit_${APP_NAME}
     restart: 'no'
     ports:
       - ${RABBIT_ADMIN_PORT}:15672
       - ${RABBIT_PORT}:5672
     environment:
+      # default user will not work
+      # https://github.com/docker-library/rabbitmq/issues/452
       RABBITMQ_DEFAULT_USER: ${USER}
       RABBITMQ_DEFAULT_PASS: ${PASSWORD}
-      RABBITMQ_DEFAULT_VHOST: rabbitmq
+      RABBITMQ_DEFAULT_VHOST: ${APP_NAME}
 
 volumes:
   pgsql:
diff --git a/docker/nginx/default b/docker/nginx/templates/default.conf.template
similarity index 100%
rename from docker/nginx/default
rename to docker/nginx/templates/default.conf.template
diff --git a/docker/php-fpm/supervisor.conf b/docker/php-fpm/supervisor.conf
index b3d2600..ddbec74 100644
--- a/docker/php-fpm/supervisor.conf
+++ b/docker/php-fpm/supervisor.conf
@@ -12,7 +12,7 @@ serverurl=unix:///var/run/supervisor.sock ; use a unix:// URL  for a unix socket
 supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
 
 [program:php-fpm]
-command=/usr/bin/php-fpm
+command=/usr/sbin/php-fpm7.4
 autostart = true
 autorestart = false
 stopasgroup=true
diff --git a/docker/userconfigs/.gitignore b/docker/userconfigs/.gitignore
new file mode 100644
index 0000000..d6b7ef3
--- /dev/null
+++ b/docker/userconfigs/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore