diff --git a/playbooks/zuul/gerrit/repos.yaml b/playbooks/zuul/gerrit/repos.yaml
index c89c959102..11ed8c5274 100644
--- a/playbooks/zuul/gerrit/repos.yaml
+++ b/playbooks/zuul/gerrit/repos.yaml
@@ -15,20 +15,25 @@
           - unzip
         state: present
 
-    - name: Move plugin repos into gerrit tree
+    - name: Move common plugin repos into gerrit tree
       command: "mv -f {{ item }} ../gerrit/plugins"
       args:
         chdir: /home/zuul/src/gerrit.googlesource.com/plugins
       loop:
+        - codemirror-editor
         - commit-message-length-validator
+        - delete-project
+        - download-commands
+        - gitiles
         - hooks
-        - its-storyboard
         - its-base
+        - its-storyboard
         - javamelody
+        - plugin-manager
         - replication
         - reviewnotes
-        - download-commands
         - singleusergroup
+        - webhooks
 
     # Some submodules don't have appropriate refs to checkout for specific
     # gerrit branches. We address that by checking them out explicitly in
diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml
index c6a41fd414..30d8983c28 100644
--- a/zuul.d/docker-images/gerrit.yaml
+++ b/zuul.d/docker-images/gerrit.yaml
@@ -96,12 +96,6 @@
           path: /home/zuul/src/gerrit.googlesource.com/gerrit
           tags:
             - 3.2
-      gerrit_additional_plugins:
-        - codemirror-editor
-        - delete-project
-        - gitiles
-        - plugin-manager
-        - webhooks
     files: &gerrit_files_3_2
       - docker/gerrit/base/
       - docker/gerrit/bazel/
@@ -174,11 +168,6 @@
             - master
       gerrit_additional_plugins:
         - checks
-        - codemirror-editor
-        - delete-project
-        - gitiles
-        - plugin-manager
-        - webhooks
 
 - job:
     name: system-config-build-image-gerrit-master