diff --git a/.env.dist b/.env.dist
index dfd6357..094e5d7 100644
--- a/.env.dist
+++ b/.env.dist
@@ -2,12 +2,12 @@ PROJECT_DIR=.
 # all container will be appended with this
 APP_NAME=dev_station
 # default user/password pair for all services
-USER=user
+APP_USER=user
 EMAIL=some@some.com
 PASSWORD=password
 # ports config
-PG_ADMIN_PORT=1080
 NGINX_PORT=8080
+PG_ADMIN_PORT=1080
 PG_PORT=5432
 RABBIT_PORT=5672
 RABBIT_ADMIN_PORT=15672
diff --git a/docker-compose.dist.yml b/docker-compose.dist.yml
index 0237c6f..b71240a 100644
--- a/docker-compose.dist.yml
+++ b/docker-compose.dist.yml
@@ -29,6 +29,10 @@ services:
       # Just put them under ./docker/userconfigs/
       # and map as following
       # - ./docker/userconfigs/supervisor/conf.d:/etc/supervisor/conf.d
+    environment:
+      XDEBUG_PORT: ${XDEBUG_PORT}
+      XDEBUG_HOST: ${XDEBUG_HOST}
+      XDEBUG_IDE: ${XDEBUG_IDE}
 
   postgres:
     image: postgis/postgis:12-master
@@ -61,8 +65,8 @@ services:
     ports:
       - ${MYSQL_LEGACY_PORT}:3306
     volumes:
-      - ./mysql/my.cnf:/etc/alternatives/my.cnf
-      - ./mysql/mysql.conf.d:/etc/mysql/conf.d/
+      - ./docker/mysql/my.cnf:/etc/alternatives/my.cnf
+      - ./docker/mysql/mysql.conf.d:/etc/mysql/conf.d/
       - mysql_legacy:/var/lib/mysql
     environment:
       MYSQL_TCP_PORT: ${MYSQL_LEGACY_PORT}
@@ -79,7 +83,7 @@ services:
       - ${MYSQL_PORT}:3306
     volumes:
       - mysql:/var/lib/mysql
-      - ./mysql-latest:/etc/mysql/conf.d
+      - ./docker/mysql-latest:/etc/mysql/conf.d
 
   rabbitmq:
     image: rabbitmq:management-alpine
@@ -89,9 +93,7 @@ services:
       - ${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_USER: ${APP_USER}
       RABBITMQ_DEFAULT_PASS: ${PASSWORD}
       RABBITMQ_DEFAULT_VHOST: ${APP_NAME}