diff --git a/.env/development.env.template b/.environment/development.env.template
similarity index 87%
rename from .env/development.env.template
rename to .environment/development.env.template
index 7e92aac..0a5f289 100644
--- a/.env/development.env.template
+++ b/.environment/development.env.template
@@ -1,11 +1,11 @@
-POSTGRES_HOST=app-db
+POSTGRES_HOST=db
 POSTGRES_PORT=5432
 POSTGRES_DB=django
 POSTGRES_USER=django
 POSTGRES_PASSWORD=django
 
 REDIS_URL=redis://app-redis:6379/1
-REDIS_HOST=app-redis
+REDIS_HOST=redis
 REDIS_PORT=6379
 REDIS_DB=1
 REDIS_TIMEOUT=600
diff --git a/.env/production.env.template b/.environment/production.env.template
similarity index 89%
rename from .env/production.env.template
rename to .environment/production.env.template
index cd7ba5c..4186dd0 100644
--- a/.env/production.env.template
+++ b/.environment/production.env.template
@@ -1,11 +1,11 @@
-POSTGRES_HOST=app-db
+POSTGRES_HOST=db
 POSTGRES_PORT=5432
 POSTGRES_DB=
 POSTGRES_USER=
 POSTGRES_PASSWORD=
 
 REDIS_URL=redis://app-redis:6379/1
-REDIS_HOST=app-redis
+REDIS_HOST=redis
 REDIS_PORT=6379
 REDIS_DB=1
 REDIS_TIMEOUT=600
diff --git a/.gitignore b/.gitignore
index 122a9df..d738c86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,9 +62,9 @@ typings/
 .yarn-integrity
 
 # dotenv environment variables file
-.env/*
-!.env/development.env.template
-!.env/production.env.template
+.environment/*
+!.environment/development.env.template
+!.environment/production.env.template
 
 # coverage report
 htmlcov/
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 0e71909..ceb378a 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -7,19 +7,19 @@ services:
     volumes:
       - ./server/:/home/app/web/
     env_file:
-      - .env/development.env
+      - .environment/development.env
     command: python manage.py runserver 0.0.0.0:8000
     ports:
       - 8000:8000
   db:
     env_file:
-      - .env/development.env
+      - .environment/development.env
   rq:
     build:
       context: ./server
       dockerfile: Dockerfile.dev
     env_file:
-      - .env/development.env
+      - .environment/development.env
   client:
     build:
       context: ./client
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index b49e07c..77b63b8 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -5,17 +5,17 @@ services:
             context: ./server
             dockerfile: Dockerfile.prod
         env_file:
-            - .env/production.env
+            - .environment/production.env
         command: gunicorn config.wsgi:application --bind 0.0.0.0:8000
     db:
         env_file:
-            - .env/production.env
+            - .environment/production.env
     rq:
         build:
             context: ./server
             dockerfile: Dockerfile.dev
         env_file:
-            - .env/production.env
+            - .environment/production.env
     client:
         build:
             context: ./client
@@ -23,7 +23,7 @@ services:
         environment:
           - NODE_ENV=production
         env_file:
-            - .env/production.env
+            - .environment/production.env
         volumes:
             - ./client/node_modules:/app/node_modules
             - volume-static:/var/www/staticfiles:ro