diff --git a/manifest.yaml b/manifest.yaml
index f6608689c4af66bf2e888646572bd9a55f5276fb..a6ed8df1321256cd217a47539998588425f90f08 100644
--- a/manifest.yaml
+++ b/manifest.yaml
@@ -109,6 +109,8 @@ spec:
         image: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME/polls:${CI_COMMIT_SHORT_SHA}
         imagePullPolicy: Always
         env:
+        - name: DATABASE_HOST
+          value: postgresql
         - name: DATABASE_NAME
           valueFrom:
             secretKeyRef:
@@ -178,6 +180,8 @@ spec:
               image: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_NAME/polls:${CI_COMMIT_SHORT_SHA}
               command: ['python', '/app/manage.py', 'migrate']
               env:
+              - name: DATABASE_HOST
+                value: postgresql
               - name: DATABASE_NAME
                 valueFrom:
                   secretKeyRef:
diff --git a/mysite/settings.py b/mysite/settings.py
index 4baea884194411eace28d38852fb8e63f8224969..d56e54fcfe4dbfdbbff789a33255a65ed4ee37a9 100755
--- a/mysite/settings.py
+++ b/mysite/settings.py
@@ -82,7 +82,7 @@ DATABASES = {
         # If you are using Cloud SQL for MySQL rather than PostgreSQL, set
         # 'ENGINE': 'django.db.backends.mysql' instead of the following.
         'ENGINE': 'django.db.backends.postgresql',
-        'NAME': 'polls',
+        'NAME': os.getenv('DATABASE_NAME'),
         'USER': os.getenv('DATABASE_USER'),
         'PASSWORD': os.getenv('DATABASE_PASSWORD'),
         'HOST': os.getenv('DATABASE_HOST'),