diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile
index 9a83eb6..ec1b483 100644
--- a/gerrit/Dockerfile
+++ b/gerrit/Dockerfile
@@ -2,19 +2,14 @@
 
 USER root
 
-#ADD https://github.com/davido/gerrit-oauth-provider/releases/download/v3.0.0/gerrit-oauth-provider.jar /var/gerrit/plugins/gerrit-oauth-provider.jar
-ADD https://gerrit-ci.gerritforge.com/job/plugin-oauth-bazel-master-stable-3.4/lastSuccessfulBuild/artifact/bazel-bin/plugins/oauth/oauth.jar /var/gerrit/plugins/gerrit-oauth-provider.jar
-#ADD https://gerrit-ci.gerritforge.com/job/plugin-gitblit-bazel-master/8/artifact/bazel-bin/plugins/gitblit/gitblit.jar  /var/gerrit/plugins/gitblit.jar
-ADD https://github.com/tomaswolf/gerrit-gitblit-plugin/releases/download/v3.2.171.0/gitblit-plugin-3.2.171.0.jar /var/gerrit/plugins/gitblit.jar
-#ADD https://gerrit-ci.gerritforge.com/job/plugin-its-phabricator-bazel-stable-2.15/14/artifact/bazel-genfiles/plugins/its-phabricator/its-phabricator.jar /var/gerrit/plugins/its-phabricator.jar
-ADD https://gerrit-ci.gerritforge.com/job/plugin-serviceuser-bazel-master-stable-3.4/lastSuccessfulBuild/artifact/bazel-bin/plugins/serviceuser/serviceuser.jar /var/gerrit/plugins/serviceuser.jar
-ADD https://gerrit-ci.gerritforge.com/job/plugin-lfs-bazel-master-stable-3.4/lastSuccessfulBuild/artifact/bazel-bin/plugins/lfs/lfs.jar /var/gerrit/plugins/lfs.jar
-ADD https://gerrit-ci.gerritforge.com/job/plugin-ref-protection-bazel-master-stable-3.4/lastSuccessfulBuild/artifact/bazel-bin/plugins/ref-protection/ref-protection.jar /var/gerrit/plugins/ref-protection.jar
-#ADD https://gerrit-ci.gerritforge.com/job/plugin-x-docs-bazel-stable-2.15/8/artifact/bazel-genfiles/plugins/x-docs/x-docs.jar /var/gerrit/plugins/x-docs.jar
-ADD https://gerrit-ci.gerritforge.com/job/plugin-rename-project-bazel-master-stable-3.4/lastSuccessfulBuild/artifact/bazel-bin/plugins/rename-project/rename-project.jar /var/gerrit/plugins/rename-project.jar
-ADD https://gerrit-ci.gerritforge.com/job/plugin-admin-console-bazel-master-stable-3.4/lastSuccessfulBuild/artifact/bazel-bin/plugins/admin-console/admin-console.jar /var/gerrit/plugins/admin-console.jar
-ADD https://gerrit-ci.gerritforge.com/job/plugin-github-mvn-stable-3.4/lastSuccessfulBuild/artifact/github-plugin/target/github-plugin-3.4.0-rc0.jar /var/gerrit/plugins/github.jar
-ADD https://gerrit-ci.gerritforge.com/job/plugin-github-mvn-stable-3.4/lastSuccessfulBuild/artifact/github-oauth/target/github-oauth-3.4.0-rc0.jar /var/gerrit/lib/github-oauth.jar
+ADD https://gerrit-ci.gerritforge.com/job/plugin-oauth-bazel-master-stable-3.7/lastSuccessfulBuild/artifact/bazel-bin/plugins/oauth/oauth.jar /var/gerrit/plugins/gerrit-oauth-provider.jar
+ADD https://gerrit-ci.gerritforge.com/job/plugin-serviceuser-bazel-master-stable-3.7/lastSuccessfulBuild/artifact/bazel-bin/plugins/serviceuser/serviceuser.jar /var/gerrit/plugins/serviceuser.jar
+ADD https://gerrit-ci.gerritforge.com/job/plugin-lfs-bazel-master-stable-3.7/lastSuccessfulBuild/artifact/bazel-bin/plugins/lfs/lfs.jar /var/gerrit/plugins/lfs.jar
+ADD https://gerrit-ci.gerritforge.com/job/plugin-ref-protection-bazel-master-stable-3.7/lastSuccessfulBuild/artifact/bazel-bin/plugins/ref-protection/ref-protection.jar /var/gerrit/plugins/ref-protection.jar
+ADD https://gerrit-ci.gerritforge.com/job/plugin-rename-project-bazel-master-stable-3.6/lastSuccessfulBuild/artifact/bazel-bin/plugins/rename-project/rename-project.jar /var/gerrit/plugins/rename-project.jar
+ADD https://gerrit-ci.gerritforge.com/job/plugin-admin-console-bazel-master-stable-3.7/lastSuccessfulBuild/artifact/bazel-bin/plugins/admin-console/admin-console.jar /var/gerrit/plugins/admin-console.jar
+ADD https://gerrit-ci.gerritforge.com/job/plugin-github-mvn-stable-3.7/lastSuccessfulBuild/artifact/github-plugin/target/github-plugin-3.7.0-rc3.jar /var/gerrit/plugins/github.jar
+ADD https://gerrit-ci.gerritforge.com/job/plugin-github-mvn-stable-3.7/lastSuccessfulBuild/artifact/github-oauth/target/github-oauth-3.7.0-rc3.jar /var/gerrit/lib/github-oauth.jar
 
 RUN chown gerrit /var/gerrit/plugins/* /var/gerrit/lib/*
 
diff --git a/gerrit/gerrit-k8s.yaml b/gerrit/gerrit-k8s.yaml
index 92d5966..28341e9 100644
--- a/gerrit/gerrit-k8s.yaml
+++ b/gerrit/gerrit-k8s.yaml
@@ -111,7 +111,7 @@
             defaultMode: 0444
       #initContainers:
       #  - name: reindex
-      #    image: docker.benkard.de/mulk/gerrit:3.4.1-4
+      #    image: docker.benkard.de/mulk/gerrit:3.7.1-1
       #    command:
       #      - java
       #      - -jar
@@ -119,6 +119,8 @@
       #      - reindex
       #      - -d
       #      - /var/gerrit
+      ##      - --index
+      ##      - changes
       #    env:
       #      - name: _JAVA_OPTIONS
       #        value: -Xmx300m -XX:MaxMetaspaceSize=150m -XX:+CMSClassUnloadingEnabled -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv4Addresses=true -XX:+UnlockExperimentalVMOptions -XX:+UseSerialGC -XX:+UseCompressedOops -XX:+AlwaysPreTouch -XX:+ScavengeBeforeFullGC -XX:+DisableExplicitGC
@@ -141,11 +143,11 @@
       #        subPath: gerrit.config
       containers:
         - name: master
-          image: docker.benkard.de/mulk/gerrit:3.4.1-2
+          image: docker.benkard.de/mulk/gerrit:3.7.1-1
 
           # for running `init`:
           #
-          #   java -jar /var/gerrit/bin/gerrit.war init -d /var/gerrit
+          #   kubectl exec -ti deploy/gerrit -- java -jar /var/gerrit/bin/gerrit.war init -d /var/gerrit
           #
           # or the H2 console:
           #