diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml
index 0033ebf58d..d33b15b8fa 100644
--- a/zuul.d/docker-images/gerrit.yaml
+++ b/zuul.d/docker-images/gerrit.yaml
@@ -130,6 +130,97 @@
     vars: *gerrit_vars_3_6
     files: *gerrit_files_3_6
 
+# Gerrit 3.7 jobs
+- job:
+    name: system-config-build-image-gerrit-3.7
+    description: Build a gerrit image.
+    parent: system-config-build-image
+    pre-run:
+      - playbooks/zuul/gerrit/repos.yaml
+      - playbooks/zuul/gerrit/submodules.yaml
+    run: playbooks/zuul/gerrit/run.yaml
+    requires: gerrit-base-container-image
+    provides: gerrit-3.7-container-image
+    required-projects: &gerrit_projects_3_7
+      - name: opendev/system-config
+        override-checkout: master
+      - name: gerrit.googlesource.com/gerrit
+        override-checkout: stable-3.7
+      # Backend behavior plugins
+      - name: gerrit.googlesource.com/plugins/commit-message-length-validator
+        override-checkout: v3.7.0
+      - name: gerrit.googlesource.com/plugins/delete-project
+        override-checkout: v3.7.0
+      - name: gerrit.googlesource.com/plugins/hooks
+        override-checkout: v3.7.0
+      - name: gerrit.googlesource.com/plugins/its-base
+        # There is no 3.7 branch
+        override-checkout: master
+      - name: gerrit.googlesource.com/plugins/its-storyboard
+        # There is no 3.7 branch
+        override-checkout: master
+      - name: gerrit.googlesource.com/plugins/plugin-manager
+        override-checkout: v3.7.0
+      - name: gerrit.googlesource.com/plugins/replication
+        override-checkout: v3.7.0
+      - name: gerrit.googlesource.com/plugins/reviewnotes
+        override-checkout: v3.7.0
+      - name: gerrit.googlesource.com/plugins/singleusergroup
+        override-checkout: v3.7.0
+      - name: gerrit.googlesource.com/plugins/webhooks
+        override-checkout: v3.7.0
+      # UI behavior plugins
+      - name: gerrit.googlesource.com/plugins/codemirror-editor
+        override-checkout: v3.7.0
+      - name: gerrit.googlesource.com/plugins/download-commands
+        override-checkout: v3.7.0
+      - name: gerrit.googlesource.com/plugins/gitiles
+        override-checkout: v3.7.0
+      - name: gerrit.googlesource.com/plugins/zuul-results-summary
+        override-checkout: main
+      # Non plugin submodules
+      - name: gerrit.googlesource.com/jgit
+        override-checkout: master
+      - name: gerrit.googlesource.com/polymer-bridges
+        override-checkout: v3.7.0
+    vars: &gerrit_vars_3_7
+      docker_images:
+        - context: docker/gerrit/bazel
+          repository: opendevorg/gerrit
+          target: gerrit
+          path: /home/zuul/src/gerrit.googlesource.com/gerrit
+          tags:
+            - 3.7
+    files: &gerrit_files_3_7
+      - docker/gerrit/base/
+      - docker/gerrit/bazel/
+      - playbooks/zuul/gerrit/
+      - playbooks/test-review.yaml
+      - testinfra/test_gerrit.py
+      - jeepyb/
+      - roles/bazelisk-build/
+
+- job:
+    name: system-config-upload-image-gerrit-3.7
+    description: Build and upload a gerrit image.
+    parent: system-config-upload-image
+    pre-run:
+      - playbooks/zuul/gerrit/repos.yaml
+      - playbooks/zuul/gerrit/submodules.yaml
+    run: playbooks/zuul/gerrit/run.yaml
+    requires: gerrit-base-container-image
+    provides: gerrit-3.7-container-image
+    required-projects: *gerrit_projects_3_7
+    vars: *gerrit_vars_3_7
+    files: *gerrit_files_3_7
+
+- job:
+    name: system-config-promote-image-gerrit-3.7
+    description: Promote a previously published gerrit image to latest.
+    parent: system-config-promote-image
+    vars: *gerrit_vars_3_7
+    files: *gerrit_files_3_7
+
 # Gerrit master jobs
 - job:
     name: system-config-build-image-gerrit-master-base
@@ -228,6 +319,11 @@
               - name: opendev-buildset-registry
               - name: system-config-build-image-gerrit-base
                 soft: true
+        - system-config-build-image-gerrit-3.7:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-build-image-gerrit-base
+                soft: true
         - system-config-build-image-gerrit-master:
             voting: false
             dependencies:
@@ -246,7 +342,13 @@
               - name: opendev-buildset-registry
               - name: system-config-upload-image-gerrit-base
                 soft: true
+        - system-config-upload-image-gerrit-3.7:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-upload-image-gerrit-base
+                soft: true
     deploy:
       jobs:
         - system-config-promote-image-gerrit-base
         - system-config-promote-image-gerrit-3.6
+        - system-config-promote-image-gerrit-3.7
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 4491533219..019afccb98 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -70,13 +70,18 @@
               - name: opendev-buildset-registry
               - name: system-config-build-image-gerrit-3.6
                 soft: true
+        - system-config-run-review-3.7:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-build-image-gerrit-3.7
+                soft: true
         #- system-config-upgrade-review:
         #    dependencies:
         #      - name: opendev-buildset-registry
-        #      - name: system-config-build-image-gerrit-3.5
-        #        soft: true
         #      - name: system-config-build-image-gerrit-3.6
         #        soft: true
+        #      - name: system-config-build-image-gerrit-3.7
+        #        soft: true
         - system-config-build-image-refstack
         - system-config-run-refstack:
             dependencies:
@@ -222,6 +227,11 @@
               - name: opendev-buildset-registry
               - name: system-config-upload-image-gerrit-3.6
                 soft: true
+        - system-config-run-review-3.7:
+            dependencies:
+              - name: opendev-buildset-registry
+              - name: system-config-upload-image-gerrit-3.7
+                soft: true
         - system-config-run-refstack:
             dependencies:
               - name: opendev-buildset-registry
diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml
index bea5510f62..43537805bd 100644
--- a/zuul.d/system-config-run.yaml
+++ b/zuul.d/system-config-run.yaml
@@ -1118,20 +1118,29 @@
     vars:
       zuul_test_gerrit_version: '3.6'
 
+- job:
+    name: system-config-run-review-3.7
+    parent: system-config-run-review-base
+    description: |
+      Run the playbook for gerrit 3.7 (in a container).
+    requires: gerrit-3.6-container-image
+    vars:
+      zuul_test_gerrit_version: '3.7'
+
 #- job:
 #    name: system-config-upgrade-review
 #    parent: system-config-run-review-base
 #    description: |
-#      Test we can upgrade a gerrit 3.5 to 3.6
+#      Test we can upgrade a gerrit 3.6 to 3.7
 #    requires:
-#      - gerrit-3.5-container-image
 #      - gerrit-3.6-container-image
+#      - gerrit-3.7-container-image
 #    vars:
 #      run_playbooks:
 #        - playbooks/letsencrypt.yaml
 #        - playbooks/zuul/upgrade-review.yaml
 #      run_test_playbook: playbooks/zuul/test-review.yaml
-#      zuul_test_gerrit_version: '3.5'
+#      zuul_test_gerrit_version: '3.6'
 
 - job:
     name: system-config-run-static