diff --git a/djangoproject/settings/docker.py b/djangoproject/settings/docker.py
index 1484a008e..ed5a8b7f2 100644
--- a/djangoproject/settings/docker.py
+++ b/djangoproject/settings/docker.py
@@ -2,24 +2,24 @@
 
 DATABASES = {
     "default": {
-        "ENGINE": os.environ.get("SQL_ENGINE"),
-        "NAME": os.environ.get("SQL_DATABASE"),
-        "USER": os.environ.get("SQL_USER"),
-        "PASSWORD": os.environ.get("SQL_PASSWORD"),
-        "HOST": os.environ.get("SQL_HOST"),
-        "PORT": os.environ.get("SQL_PORT"),
-    }
+        "ENGINE": os.environ["SQL_ENGINE"],
+        "NAME": os.environ["SQL_DATABASE"],
+        "USER": os.environ["SQL_USER"],
+        "PASSWORD": os.environ["SQL_PASSWORD"],
+        "HOST": os.environ["SQL_HOST"],
+        "PORT": os.environ["SQL_PORT"],
+    },
+    "trac": {
+        "ENGINE": "django.db.backends.postgresql",
+        "NAME": os.environ["TRAC_DATABASE"],
+        # "code.djangoproject" value is hardcoded in trac.sql
+        "USER": "code.djangoproject",
+        "PASSWORD": os.environ["TRAC_PASSWORD"],
+        "HOST": os.environ["TRAC_HOST"],
+        "PORT": os.environ["TRAC_PORT"],
+    },
 }
 
-# Trac connection
-DATABASES["trac"] = {
-    "ENGINE": "django.db.backends.postgresql",
-    "NAME": os.environ.get("TRAC_DATABASE", "code.djangoproject"),
-    "USER": os.environ.get("TRAC_USER", "code.djangoproject"),
-    "PASSWORD": os.environ.get("TRAC_PASSWORD", ""),
-    "HOST": os.environ.get("TRAC_HOST", "db"),
-    "PORT": os.environ.get("TRAC_PORT", "5432"),
-}
 
 SECRET_KEY = os.environ.get("SECRET_KEY")
 
diff --git a/docker-compose.yml b/docker-compose.yml
index ff6432b79..e426cd36b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,7 +23,8 @@ services:
             - SQL_HOST=db
             - SQL_PORT=5432
             - TRAC_DATABASE=code.djangoproject
-            - TRAC_USER=code.djangoproject
+            # "code.djangoproject" value is hardcoded in trac.sql, no need to pass it via env vars
+            # - TRAC_USER=code.djangoproject
             - TRAC_PASSWORD=secret
             - TRAC_HOST=db
             - TRAC_PORT=5432