diff --git a/.cookiecutter/cookiecutter.json b/.cookiecutter/cookiecutter.json
index 1a94bef860..bb9ea8b45c 100644
--- a/.cookiecutter/cookiecutter.json
+++ b/.cookiecutter/cookiecutter.json
@@ -33,7 +33,7 @@
     "postgres": "yes",
     "docker": "yes",
     "__postgres_port": "5433",
-    "__postgres_version": "11.5-alpine",
+    "__postgres_version": "15.6-alpine",
     "__docker_namespace": "hypothesis",
     "__docker_network": "lms_default",
     "__github_url": "https://github.com/hypothesis/lms",
diff --git a/.cookiecutter/includes/.github/workflows/ci.yml b/.cookiecutter/includes/.github/workflows/ci.yml
index f2da015f53..f1b85b3c08 100644
--- a/.cookiecutter/includes/.github/workflows/ci.yml
+++ b/.cookiecutter/includes/.github/workflows/ci.yml
@@ -3,9 +3,16 @@ BDD_Tests:
   runs-on: ubuntu-latest
   services:
     postgres:
-      image: postgres:11.5-alpine
+      image: postgres:15.6-alpine
       ports:
       - 5433:5432
+      env:
+        POSTGRES_HOST_AUTH_METHOD: trust
+      options: >-
+        --health-cmd pg_isready
+        --health-interval 10s
+        --health-timeout 5s
+        --health-retries 5
   steps:
     - uses: actions/checkout@v3
     - name: Install Python
diff --git a/.cookiecutter/includes/docker-compose/services.yml b/.cookiecutter/includes/docker-compose/services.yml
index e136867d74..c710217c47 100644
--- a/.cookiecutter/includes/docker-compose/services.yml
+++ b/.cookiecutter/includes/docker-compose/services.yml
@@ -1,5 +1,5 @@
 rabbit:
- image: rabbitmq:3.6-management-alpine
+ image: rabbitmq:3.12-management-alpine
  ports:
    - '127.0.0.1:5674:5672'
    - '127.0.0.1:15674:15672'