diff --git a/docker-compose-mysql.yml b/docker-compose-mysql.yml
index 4a9c24d6..6df2c81c 100644
--- a/docker-compose-mysql.yml
+++ b/docker-compose-mysql.yml
@@ -56,7 +56,7 @@ services:
     ports:
       - "8090:80"
     volumes:
-      - ./nginx:/etc/nginx/conf.d
+      - ./nginx/mysql:/etc/nginx/conf.d
       - ./src/cdn_static_root:/static
     depends_on:
       - app
diff --git a/docker-compose-postgres.yml b/docker-compose-postgres.yml
index aa5b6384..0e0ad719 100644
--- a/docker-compose-postgres.yml
+++ b/docker-compose-postgres.yml
@@ -56,8 +56,8 @@ services:
     ports:
       - "8080:80"
     volumes:
-      - ./nginx_pg:/etc/nginx/conf.d
-      - static_volume:/static
+      - ./nginx/postgres:/etc/nginx/conf.d
+      - static_volume_pg:/static
     depends_on:
       - app_pg
     networks:
diff --git a/nginx/mysql.conf b/nginx/mysql/mysql.conf
similarity index 88%
rename from nginx/mysql.conf
rename to nginx/mysql/mysql.conf
index aee6c751..bccb002d 100644
--- a/nginx/mysql.conf
+++ b/nginx/mysql/mysql.conf
@@ -1,4 +1,5 @@
 upstream django {
+  # app and the exposed port are defined in docker-compose-mysql.yml
   server app:8000;
 }
 
diff --git a/nginx/postgres.conf b/nginx/postgres/postgres.conf
similarity index 88%
rename from nginx/postgres.conf
rename to nginx/postgres/postgres.conf
index 294187c0..b3a3ed04 100644
--- a/nginx/postgres.conf
+++ b/nginx/postgres/postgres.conf
@@ -1,4 +1,5 @@
 upstream django {
+  # app_pg and the exposed port are defined in docker-compose-postgres.yml
   server app_pg:8000;
 }