diff --git a/devtools/gerrit/BUILD b/devtools/gerrit/BUILD
index 5d397c7..406200e 100644
--- a/devtools/gerrit/BUILD
+++ b/devtools/gerrit/BUILD
@@ -6,7 +6,6 @@
     files = [
         "//devtools/gerrit/gerrit-oauth-provider:gerrit-oauth-provider",
         "@com_googlesource_gerrit_plugin_owners//owners:owners.jar",
-        "@com_googlesource_gerrit_plugin_owners//owners-autoassign:owners-autoassign.jar",
     ],
     # we cannot drop it directly in /var/gerrit/plugins as that changes the
     # directory owner to 0:0 and then breaks the gerrit installer that wants
@@ -14,7 +13,7 @@
     directory = "/var/gerrit-plugins",
 )
 container_image(
-    name="3.0.8",
+    name="3.0.8-r1",
     base=":with_plugins",
     files = [":entrypoint.sh"],
     directory = "/",
@@ -23,9 +22,9 @@
 
 container_push(
     name = "push",
-    image = ":3.0.8",
+    image = ":3.0.8-r1",
     format = "Docker",
     registry = "registry.k0.hswaw.net",
     repository = "devtools/gerrit",
-    tag = "3.0.8",
+    tag = "3.0.8-r1",
 )
diff --git a/devtools/gerrit/kube/gerrit.libsonnet b/devtools/gerrit/kube/gerrit.libsonnet
index eaac3a0..ce2982d 100644
--- a/devtools/gerrit/kube/gerrit.libsonnet
+++ b/devtools/gerrit/kube/gerrit.libsonnet
@@ -38,7 +38,7 @@
             address: "gerrit@hackerspace.pl",
         },
 
-        tag: "3.0.8",
+        tag: "3.0.8-r1",
         image: "registry.k0.hswaw.net/devtools/gerrit:" + cfg.tag,
         resources: {
             requests: {