diff --git a/assets/build/config/database.yml.postgresql b/assets/build/config/database.yml.postgresql
index 180f8b01..198db000 100644
--- a/assets/build/config/database.yml.postgresql
+++ b/assets/build/config/database.yml.postgresql
@@ -29,6 +29,14 @@ production:
     #     port: 8600
     #     record: secondary.postgresql.service.consul
     #     interval: 300
+  ci:
+    adapter: postgresql
+    encoding: unicode
+    database: gitlabhq_production
+    database_tasks: false
+    username: git
+    password: "secure password"
+    host: localhost
 #  geo:
 #    adapter: postgresql
 #    encoding: unicode
@@ -50,6 +58,16 @@ development:
     host: localhost
     variables:
       statement_timeout: 15s
+  ci:
+    adapter: postgresql
+    encoding: unicode
+    database: gitlabhq_development
+    database_tasks: false
+    username: postgres
+    password: "secure password"
+    host: localhost
+    variables:
+      statement_timeout: 15s
 #  geo:
 #    adapter: postgresql
 #    encoding: unicode
@@ -69,6 +87,14 @@ staging:
     username: git
     password: "secure password"
     host: localhost
+  ci:
+    adapter: postgresql
+    encoding: unicode
+    database: gitlabhq_staging
+    database_tasks: false
+    username: git
+    password: "secure password"
+    host: localhost
 #  geo:
 #    adapter: postgresql
 #    encoding: unicode
@@ -91,6 +117,17 @@ test: &test
     prepared_statements: false
     variables:
       statement_timeout: 15s
+  ci:
+    adapter: postgresql
+    encoding: unicode
+    database: gitlabhq_test
+    database_tasks: false
+    username: postgres
+    password:
+    host: localhost
+    prepared_statements: false
+    variables:
+      statement_timeout: 15s
 #  geo:
 #    adapter: postgresql
 #    encoding: unicode
@@ -98,3 +135,10 @@ test: &test
 #    username: postgres
 #    password:
 #    host: localhost
+#  embedding:
+#    adapter: postgresql
+#    encoding: unicode
+#    database: gitlabhq_embedding_test
+#    username: postgres
+#    password:
+#    host: localhost
diff --git a/assets/runtime/config/gitlabhq/database.yml b/assets/runtime/config/gitlabhq/database.yml
index 0423a57c..a18e55c7 100644
--- a/assets/runtime/config/gitlabhq/database.yml
+++ b/assets/runtime/config/gitlabhq/database.yml
@@ -12,4 +12,12 @@ production:
     password: "{{DB_PASS}}"
     pool: {{DB_POOL}}
     prepared_statements: {{DB_PREPARED_STATEMENTS}}
-
+  ci:
+    adapter: postgresql
+    encoding: {{DB_ENCODING}}
+    database: {{DB_NAME}}
+    database_tasks: false
+    host: {{DB_HOST}}
+    port: {{DB_PORT}}
+    username: {{DB_USER}}
+    password: "{{DB_PASS}}"