diff --git a/docker/gerrit/base/Dockerfile b/docker/gerrit/base/Dockerfile
index a71f3f4bc7..78d787b1ad 100644
--- a/docker/gerrit/base/Dockerfile
+++ b/docker/gerrit/base/Dockerfile
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Mon May  6 04:52:14 PM UTC 2024 - trigger rebuild
+# Tue May 21 04:45:30 PM UTC 2024 - trigger rebuild
 
 FROM docker.io/opendevorg/python-builder:3.11-bookworm as builder
 
diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml
index 6cc8b45058..875019b70f 100644
--- a/zuul.d/docker-images/gerrit.yaml
+++ b/zuul.d/docker-images/gerrit.yaml
@@ -62,11 +62,11 @@
         override-checkout: stable-3.8
       # Backend behavior plugins
       - name: gerrit.googlesource.com/plugins/commit-message-length-validator
-        override-checkout: v3.8.5
+        override-checkout: v3.8.6
       - name: gerrit.googlesource.com/plugins/delete-project
         override-checkout: stable-3.8
       - name: gerrit.googlesource.com/plugins/hooks
-        override-checkout: v3.8.5
+        override-checkout: v3.8.6
       - name: gerrit.googlesource.com/plugins/its-base
         # There is no 3.8 branch
         override-checkout: master
@@ -74,29 +74,29 @@
         # There is no 3.8 branch
         override-checkout: master
       - name: gerrit.googlesource.com/plugins/plugin-manager
-        override-checkout: v3.8.5
+        override-checkout: v3.8.6
       - name: gerrit.googlesource.com/plugins/replication
-        override-checkout: v3.8.5
+        override-checkout: v3.8.6
       - name: gerrit.googlesource.com/plugins/reviewnotes
-        override-checkout: v3.8.5
+        override-checkout: v3.8.6
       - name: gerrit.googlesource.com/plugins/singleusergroup
-        override-checkout: v3.8.5
+        override-checkout: v3.8.6
       - name: gerrit.googlesource.com/plugins/webhooks
-        override-checkout: v3.8.5
+        override-checkout: v3.8.6
       # UI behavior plugins
       - name: gerrit.googlesource.com/plugins/codemirror-editor
-        override-checkout: v3.8.5
+        override-checkout: v3.8.6
       - name: gerrit.googlesource.com/plugins/download-commands
-        override-checkout: v3.8.5
+        override-checkout: v3.8.6
       - name: gerrit.googlesource.com/plugins/gitiles
-        override-checkout: v3.8.5
+        override-checkout: v3.8.6
       - 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.8.5
+        override-checkout: v3.8.6
     vars: &gerrit_vars_3_8
       docker_images:
         - context: docker/gerrit/bazel
@@ -154,11 +154,11 @@
         override-checkout: stable-3.9
       # Backend behavior plugins
       - name: gerrit.googlesource.com/plugins/commit-message-length-validator
-        override-checkout: v3.9.4
+        override-checkout: v3.9.5
       - name: gerrit.googlesource.com/plugins/delete-project
         override-checkout: stable-3.9
       - name: gerrit.googlesource.com/plugins/hooks
-        override-checkout: v3.9.4
+        override-checkout: v3.9.5
       - name: gerrit.googlesource.com/plugins/its-base
         # There is no 3.9 branch
         override-checkout: master
@@ -166,22 +166,22 @@
         # There is no 3.9 branch
         override-checkout: master
       - name: gerrit.googlesource.com/plugins/plugin-manager
-        override-checkout: v3.9.4
+        override-checkout: v3.9.5
       - name: gerrit.googlesource.com/plugins/replication
-        override-checkout: v3.9.4
+        override-checkout: v3.9.5
       - name: gerrit.googlesource.com/plugins/reviewnotes
-        override-checkout: v3.9.4
+        override-checkout: v3.9.5
       - name: gerrit.googlesource.com/plugins/singleusergroup
-        override-checkout: v3.9.4
+        override-checkout: v3.9.5
       - name: gerrit.googlesource.com/plugins/webhooks
-        override-checkout: v3.9.4
+        override-checkout: v3.9.5
       # UI behavior plugins
       - name: gerrit.googlesource.com/plugins/codemirror-editor
-        override-checkout: v3.9.4
+        override-checkout: v3.9.5
       - name: gerrit.googlesource.com/plugins/download-commands
-        override-checkout: v3.9.4
+        override-checkout: v3.9.5
       - name: gerrit.googlesource.com/plugins/gitiles
-        override-checkout: v3.9.4
+        override-checkout: v3.9.5
       - name: gerrit.googlesource.com/plugins/zuul-results-summary
         override-checkout: main
       # Non plugin submodules
@@ -190,7 +190,7 @@
       - name: gerrit.googlesource.com/jgit
         override-checkout: master
       - name: gerrit.googlesource.com/polymer-bridges
-        override-checkout: v3.9.4
+        override-checkout: v3.9.5
     vars: &gerrit_vars_3_9
       docker_images:
         - context: docker/gerrit/bazel