diff --git a/.env b/.env
index 66ab877..2cd550f 100644
--- a/.env
+++ b/.env
@@ -1,8 +1,9 @@
-HOST_REDIS=radarsys-redis
+REDIS_HOST=radarsys-redis
+REDIS_PORT=6379
 POSTGRES_DB_NAME=radarsys
 POSTGRES_PORT_5432_TCP_ADDR=radarsys-postgres
 POSTGRES_PORT_5432_TCP_PORT=5432
 POSTGRES_USER=docker
 POSTGRES_PASSWORD=docker
 PGDATA=/var/lib/postgresql/data
-LC_ALL=C.UTF-8
\ No newline at end of file
+LC_ALL=C.UTF-8
diff --git a/Dockerfile b/Dockerfile
index a5357b1..d225d59 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,6 +18,3 @@ COPY . ./
 
 EXPOSE 8000
 
-RUN python manage.py collectstatic --noinput
-
-
diff --git a/docker-compose.yml b/docker-compose.yml
index 46e42e7..91c7236 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,8 +22,6 @@ services:
   redis:
     container_name: 'radarsys-redis'
     image: 'redis:3.2-alpine'
-    ports:
-      - '127.0.0.1:6300:6379'
     volumes:
       - '/data/dockers/radarsys/redis:/data'
 
@@ -41,8 +39,6 @@ services:
   postgres:
     container_name: 'radarsys-postgres'
     build: ./postgres/
-    ports:
-      - 5432:5432
     volumes:
       - ./postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
       - pgdata:/var/lib/postgresql/data
@@ -64,4 +60,4 @@ services:
 
 volumes:
   pgdata:
-    driver: local
\ No newline at end of file
+    driver: local
diff --git a/postgres/docker-entrypoint-initdb.d/create_db.sh b/postgres/docker-entrypoint-initdb.d/create_db.sh
index fea03b0..7888f11 100755
--- a/postgres/docker-entrypoint-initdb.d/create_db.sh
+++ b/postgres/docker-entrypoint-initdb.d/create_db.sh
@@ -1,3 +1,5 @@
 #!/bin/env bash
-psql -U postgres -c "CREATE USER $POSTGRES_USER PASSWORD '$POSTGRES_PASSWORD'"
-psql -U postgres -c "CREATE DATABASE $POSTGRES_DB_NAME OWNER $POSTGRES_USER"
\ No newline at end of file
+echo "Creating database..."
+psql -U postgres -c "CREATE USER $POSTGRES_USER WITH PASSWORD '$POSTGRES_PASSWORD'; CREATE ROLE "
+psql -U postgres -c "CREATE DATABASE $POSTGRES_DB_NAME; CREATE DATABASE "
+psql -U postgres -c "GRANT ALL PRIVILEGES ON DATABASE $POSTGRES_DB_NAME to $POSTGRES_USER; GRANT "
diff --git a/radarsys/settings.py b/radarsys/settings.py
index fc5b571..34b3875 100644
--- a/radarsys/settings.py
+++ b/radarsys/settings.py
@@ -122,12 +122,13 @@ STATICFILES_FINDERS = (
 )
 
 # Celery stuff
-REDIS_HOST = os.environ.get('HOST_REDIS', '127.0.0.1')
+REDIS_HOST = os.environ.get('REDIS_HOST', '127.0.0.1')
+REDIS_PORT = os.environ.get('REDIS_PORT', 6379)
 
 BROKER_TRANSPORT = 'redis'
-BROKER_URL = 'redis://%s:6379/0' % REDIS_HOST
+BROKER_URL = 'redis://{}:{}/0'.format(REDIS_HOST, REDIS_PORT)
 
-CELERY_RESULT_BACKEND = 'redis://%s:6379/0' % REDIS_HOST
+CELERY_RESULT_BACKEND = 'redis://{}:{}/0'.format(REDIS_HOST, REDIS_PORT)
 CELERY_BROKER_TRANSPORT = BROKER_URL
 CELERY_ACCEPT_CONTENT = ['application/json']
 CELERY_TASK_SERIALIZER = 'json'