diff --git a/.github/workflows/sub_essential_tests.yml b/.github/workflows/sub_essential_tests.yml
index e8a15a549b..6b1736053f 100644
--- a/.github/workflows/sub_essential_tests.yml
+++ b/.github/workflows/sub_essential_tests.yml
@@ -38,6 +38,7 @@ jobs:
           sudo echo "127.0.0.1 kafka" | sudo tee -a /etc/hosts
           sudo echo "127.0.0.1 sep24-reference-ui" | sudo tee -a /etc/hosts
           sudo echo "127.0.0.1 reference-server" | sudo tee -a /etc/hosts
+          sudo echo "127.0.0.1 reference-db" | sudo tee -a /etc/hosts
           sudo echo "127.0.0.1 wallet-server" | sudo tee -a /etc/hosts
           sudo echo "127.0.0.1 platform" | sudo tee -a /etc/hosts
           sudo echo "127.0.0.1 custody-server" | sudo tee -a /etc/hosts
diff --git a/.github/workflows/sub_extended_tests.yml b/.github/workflows/sub_extended_tests.yml
index f8337d1167..00ea5ab9b0 100644
--- a/.github/workflows/sub_extended_tests.yml
+++ b/.github/workflows/sub_extended_tests.yml
@@ -38,6 +38,7 @@ jobs:
           sudo echo "127.0.0.1 kafka" | sudo tee -a /etc/hosts
           sudo echo "127.0.0.1 sep24-reference-ui" | sudo tee -a /etc/hosts
           sudo echo "127.0.0.1 reference-server" | sudo tee -a /etc/hosts
+          sudo echo "127.0.0.1 reference-db" | sudo tee -a /etc/hosts
           sudo echo "127.0.0.1 wallet-server" | sudo tee -a /etc/hosts
           sudo echo "127.0.0.1 platform" | sudo tee -a /etc/hosts
           sudo echo "127.0.0.1 custody-server" | sudo tee -a /etc/hosts
diff --git a/.github/workflows/sub_jacoco_report.yml b/.github/workflows/sub_jacoco_report.yml
index 3454aac003..7c31bcdd7b 100644
--- a/.github/workflows/sub_jacoco_report.yml
+++ b/.github/workflows/sub_jacoco_report.yml
@@ -44,6 +44,7 @@ jobs:
           sudo echo "127.0.0.1 kafka" | sudo tee -a /etc/hosts
           sudo echo "127.0.0.1 sep24-reference-ui" | sudo tee -a /etc/hosts
           sudo echo "127.0.0.1 reference-server" | sudo tee -a /etc/hosts
+          sudo echo "127.0.0.1 reference-db" | sudo tee -a /etc/hosts
           sudo echo "127.0.0.1 wallet-server" | sudo tee -a /etc/hosts
           sudo echo "127.0.0.1 platform" | sudo tee -a /etc/hosts
           sudo echo "127.0.0.1 custody-server" | sudo tee -a /etc/hosts
diff --git a/docs/01 - Contributing/A - Development Environment.md b/docs/01 - Contributing/A - Development Environment.md
index 0fc91dce27..1b47157895 100644
--- a/docs/01 - Contributing/A - Development Environment.md	
+++ b/docs/01 - Contributing/A - Development Environment.md	
@@ -82,6 +82,7 @@ communicate with each other.
 127.0.0.1 kafka
 127.0.0.1 sep24-reference-ui
 127.0.0.1 reference-server
+127.0.0.1 reference-db
 127.0.0.1 wallet-server
 127.0.0.1 platform
 127.0.0.1 custody-server
diff --git a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/di/ServiceContainer.kt b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/di/ServiceContainer.kt
index 767ce050ed..e052c6d404 100644
--- a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/di/ServiceContainer.kt
+++ b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/di/ServiceContainer.kt
@@ -27,10 +27,10 @@ object ServiceContainer {
 
   private val database =
     Database.connect(
-      "jdbc:h2:mem:test;DB_CLOSE_DELAY=-1",
-      driver = "org.h2.Driver",
-      user = "sa",
-      password = ""
+      "jdbc:postgresql://reference-db:5433/postgres",
+      driver = "org.postgresql.Driver",
+      user = "postgres",
+      password = "password"
     )
   private val customerRepo = JdbcCustomerRepository(database)
   private val quotesRepo = JdbcQuoteRepository(database)
diff --git a/service-runner/src/main/resources/common/docker-compose.yaml b/service-runner/src/main/resources/common/docker-compose.yaml
index 97c4323438..f98dead3c8 100644
--- a/service-runner/src/main/resources/common/docker-compose.yaml
+++ b/service-runner/src/main/resources/common/docker-compose.yaml
@@ -68,3 +68,11 @@ services:
     environment:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=password
+
+  reference-db:
+    image: postgres:15.2-alpine
+    ports:
+      - "5433:5432"
+    environment:
+      - POSTGRES_USER=postgres
+      - POSTGRES_PASSWORD=password
diff --git a/service-runner/src/main/resources/docker-compose-test.yaml b/service-runner/src/main/resources/docker-compose-test.yaml
index 7866b4c073..5b0fb337a6 100644
--- a/service-runner/src/main/resources/docker-compose-test.yaml
+++ b/service-runner/src/main/resources/docker-compose-test.yaml
@@ -15,3 +15,8 @@ services:
     extends:
       file: common/docker-compose.yaml
       service: sep24-reference-ui
+  reference-db:
+    hostname: reference-db
+    extends:
+      file: common/docker-compose.yaml
+      service: reference-db
\ No newline at end of file
diff --git a/service-runner/src/main/resources/docker-compose.yaml b/service-runner/src/main/resources/docker-compose.yaml
index 77e1f66097..0a37239428 100644
--- a/service-runner/src/main/resources/docker-compose.yaml
+++ b/service-runner/src/main/resources/docker-compose.yaml
@@ -30,6 +30,7 @@ services:
       service: reference-server
     depends_on:
       - kafka
+      - reference-db
 
   sep24-reference-ui:
     extends:
@@ -45,3 +46,8 @@ services:
     extends:
       file: common/docker-compose.yaml
       service: db
+
+  reference-db:
+    extends:
+      file: common/docker-compose.yaml
+      service: reference-db