diff --git a/config/settings/base.py b/config/settings/base.py
index 5d5d0859..49dfc52c 100644
--- a/config/settings/base.py
+++ b/config/settings/base.py
@@ -53,11 +53,12 @@
         "USER": env.str("POSTGRES_USER"),
         "PASSWORD": env.str("POSTGRES_PASSWORD"),
         "HOST": env.str("POSTGRES_HOST"),
-        "PORT": env.str("POSTGRES_PORT"),
+        "PORT": env.str("POSTGRES_PORT", None),
         "ENGINE": "django.db.backends.postgresql",
         "ATOMIC_REQUESTS": True,
     }
 }
+print(f"databases: {DATABASES}")
 
 # URLS
 # ------------------------------------------------------------------------------
diff --git a/config/settings/test.py b/config/settings/test.py
index feebcc62..037853e2 100644
--- a/config/settings/test.py
+++ b/config/settings/test.py
@@ -83,4 +83,3 @@ def require_env(name: str) -> str:
 require_env("POSTGRES_USER")
 require_env("POSTGRES_PASSWORD")
 require_env("POSTGRES_HOST")
-require_env("POSTGRES_PORT")
diff --git a/entrypoint b/entrypoint
index 3e14e425..4799bf0b 100644
--- a/entrypoint
+++ b/entrypoint
@@ -4,32 +4,6 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-postgres_ready() {
-python << END
-import sys
-
-import psycopg2
-
-try:
-    psycopg2.connect(
-        dbname="${POSTGRES_DB}",
-        user="${POSTGRES_USER}",
-        password="${POSTGRES_PASSWORD}",
-        host="${POSTGRES_HOST}",
-        port="${POSTGRES_PORT}",
-    )
-except psycopg2.OperationalError:
-    sys.exit(-1)
-sys.exit(0)
-
-END
-}
-until postgres_ready; do
-  >&2 echo 'Waiting for PostgreSQL to become available...'
-  sleep 1
-done
->&2 echo 'PostgreSQL is available'
-
 python /app/manage.py migrate
 >&2 echo 'Ran database migrations...'