diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py
index d3437084..47e9aefe 100644
--- a/dynamicweb/settings/base.py
+++ b/dynamicweb/settings/base.py
@@ -255,7 +255,11 @@ CMS_TEMPLATES = (
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'app',
+        'NAME': env('POSTGRES_DB', 'app'),
+        'USER': env('POSTGRES_USER', 'app'),
+        'PASSWORD': env('POSTGRES_PASSWORD', 'app'),
+        'HOST': env('POSTGRES_HOST', 'db'),
+        'PORT': env('POSTGRES_PORT', '5432'),
     }
 }
 
diff --git a/entrypoint.sh b/entrypoint.sh
index 7829b27f..56fc7430 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -20,19 +20,6 @@ if [ -z "${DJANGO_SECRET_KEY:-}" ]; then
     export DJANGO_SECRET_KEY
 fi
 
-cat > dynamicweb/settings/dynamic.py <<PYEOF
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': '${POSTGRES_DB:-app}',
-        'USER': '${POSTGRES_USER:-app}',
-        'PASSWORD': '${POSTGRES_PASSWORD:-app}',
-        'HOST': '${POSTGRES_HOST:-db}',
-        'PORT': '${POSTGRES_PORT:-5432}',
-    }
-}
-PYEOF
-
 # Wait for postgres to accept connections
 python - <<'PYEOF'
 import os, socket, sys, time