diff --git a/djangoproject/settings/docker.py b/djangoproject/settings/docker.py
index 917b818e1..35216e40c 100644
--- a/djangoproject/settings/docker.py
+++ b/djangoproject/settings/docker.py
@@ -11,6 +11,16 @@
     }
 }
 
+# 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")
 
 ALLOWED_HOSTS = [".localhost", "127.0.0.1", "www.127.0.0.1"]
@@ -18,4 +28,4 @@
 LOCALE_MIDDLEWARE_EXCLUDED_HOSTS = ["docs.djangoproject.localhost"]
 
 # django-hosts settings
-PARENT_HOST = "localhost:8000"
+PARENT_HOST = "djangoproject.localhost:8000"
diff --git a/docker-compose.yml b/docker-compose.yml
index fc7524f28..48fce609b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,6 +21,12 @@ services:
             - SQL_PASSWORD=secret
             - SQL_HOST=db
             - SQL_PORT=5432
+            - TRAC_DATABASE=code.djangoproject
+            - TRAC_USER=code.djangoproject
+            - TRAC_PASSWORD=secret
+            - TRAC_HOST=db
+            - TRAC_PORT=5432
+
         depends_on:
             db:
                 condition: service_healthy
@@ -35,3 +41,5 @@ services:
             interval: 1s
             timeout: 10s
             retries: 10
+        volumes:
+            - ./initdb/tracdb.sql:/docker-entrypoint-initdb.d/tracdb.sql
diff --git a/docker-entrypoint.dev.sh b/docker-entrypoint.dev.sh
index 11a38190b..a15a7149b 100755
--- a/docker-entrypoint.dev.sh
+++ b/docker-entrypoint.dev.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 python -m manage flush --no-input
-# PGPASSWORD=djangoproject psql --host db --port 5432 --username=code.djangoproject --dbname=code.djangoproject < tracdb/trac.sql
+PGPASSWORD=secret psql --host db --port 5432 --username=code.djangoproject --dbname=code.djangoproject < tracdb/trac.sql
 python -m manage migrate
 make compile-scss # must come before collectstatic
 python -m manage collectstatic --no-input --clear
diff --git a/initdb/tracdb.sql b/initdb/tracdb.sql
new file mode 100644
index 000000000..28ce982fd
--- /dev/null
+++ b/initdb/tracdb.sql
@@ -0,0 +1,3 @@
+-- Legacy Trac DB
+CREATE USER "code.djangoproject" WITH PASSWORD 'secret' CREATEDB;
+CREATE DATABASE "code.djangoproject" OWNER "code.djangoproject";