diff --git a/docker-compose.yml b/docker-compose.yml
index 69e531e5b9..3e1dc695be 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
 
   db:
-    image: postgres:14
+    image: postgres:16.4
     command: postgres -c 'max_connections=250'
     environment:
       - POSTGRES_MULTIPLE_DATABASES=dpc_attribution,dpc_queue,dpc_auth,dpc_consent,dpc-website_development,bcda,dpc-portal_development
@@ -12,7 +12,8 @@ services:
       # based on the POSTGRES_MULTIPLE_DATABASES variable above.
       - ./docker/postgres:/docker-entrypoint-initdb.d
       # Mount persistent volume to ensure data is not erased across containers.
-      - pgdata14:/var/lib/postgresql/data
+      - pgdata16:/var/lib/postgresql/data
+      - ./tmp:/var/tmp
 
   aggregation:
     image: ${ECR_HOST:-755619740999.dkr.ecr.us-east-1.amazonaws.com/dpc-aggregation}:latest
@@ -117,7 +118,7 @@ services:
     network_mode: host
 
 volumes:
-  pgdata14:
+  pgdata16:
   export-volume:
     driver: local
     driver_opts:
diff --git a/dpc-admin-portal-test.sh b/dpc-admin-portal-test.sh
index 62a707e89e..ad28899d5a 100755
--- a/dpc-admin-portal-test.sh
+++ b/dpc-admin-portal-test.sh
@@ -3,7 +3,7 @@ set -e
 
 function _finally {
     docker compose -p start-v1-portals -f docker-compose.yml -f docker-compose.portals.yml down
-    docker volume rm start-v1-portals_pgdata14
+    docker volume rm start-v1-portals_pgdata16
 }
 trap _finally EXIT
 
diff --git a/dpc-portal-accessibility-test.sh b/dpc-portal-accessibility-test.sh
index 307da31016..abcdfe6129 100755
--- a/dpc-portal-accessibility-test.sh
+++ b/dpc-portal-accessibility-test.sh
@@ -3,7 +3,7 @@ set -e
 
 function _finally {
     docker compose -p start-v1-portals -f docker-compose.yml -f docker-compose.portals.yml down
-    docker volume rm start-v1-portals_pgdata14
+    docker volume rm start-v1-portals_pgdata16
 }
 trap _finally EXIT
 
diff --git a/dpc-portal-test.sh b/dpc-portal-test.sh
index 4d74d5eecf..17fe8dcfc5 100755
--- a/dpc-portal-test.sh
+++ b/dpc-portal-test.sh
@@ -3,7 +3,7 @@ set -e
 
 function _finally {
     docker compose -p start-v1-portals -f docker-compose.yml -f docker-compose.portals.yml down
-    docker volume rm start-v1-portals_pgdata14
+    docker volume rm start-v1-portals_pgdata16
 }
 trap _finally EXIT
 
diff --git a/dpc-portals-test.sh b/dpc-portals-test.sh
index 3befd4e1b2..1f4c6dc5f6 100755
--- a/dpc-portals-test.sh
+++ b/dpc-portals-test.sh
@@ -3,7 +3,7 @@ set -e
 
 function _finally {
     docker compose -p start-v1-portals -f docker-compose.yml -f docker-compose.portals.yml down
-    docker volume rm start-v1-portals_pgdata14
+    docker volume rm start-v1-portals_pgdata16
 }
 trap _finally EXIT
 
diff --git a/dpc-test.sh b/dpc-test.sh
index f55dee6f2a..81ad69c2d3 100755
--- a/dpc-test.sh
+++ b/dpc-test.sh
@@ -14,7 +14,7 @@ set +o allexport
 
 function _finally {
   docker compose -p start-v1-app down
-  docker volume rm start-v1-app_pgdata14
+  docker volume rm start-v1-app_pgdata16
 }
 
 trap _finally EXIT
@@ -45,7 +45,7 @@ if [ -n "$REPORT_COVERAGE" ]; then
 fi
 
 docker compose -p start-v1-app down
-docker volume rm start-v1-app_pgdata14
+docker volume rm start-v1-app_pgdata16
 docker compose -p start-v1-app up start_core_dependencies
 docker compose -p start-v1-app up start_api_dependencies
 
@@ -53,7 +53,7 @@ docker compose -p start-v1-app up start_api_dependencies
 docker compose -p start-v1-app up --exit-code-from tests tests
 
 docker compose -p start-v1-app down
-docker volume rm start-v1-app_pgdata14
+docker volume rm start-v1-app_pgdata16
 docker compose -p start-v1-app up start_core_dependencies
 docker compose -p start-v1-app up start_api_dependencies
 
diff --git a/dpc-web-portal-test.sh b/dpc-web-portal-test.sh
index 9572ff94ca..7493017956 100755
--- a/dpc-web-portal-test.sh
+++ b/dpc-web-portal-test.sh
@@ -3,7 +3,7 @@ set -e
 
 function _finally {
     docker compose -p start-v1-portals -f docker-compose.yml -f docker-compose.portals.yml down
-    docker volume rm start-v1-portals_pgdata14
+    docker volume rm start-v1-portals_pgdata16
 }
 trap _finally EXIT