diff --git a/devtools/ci/remote-cache/BUILD.bazel b/devtools/ci/remote-cache/BUILD.bazel
index 4d46955..056a371 100644
--- a/devtools/ci/remote-cache/BUILD.bazel
+++ b/devtools/ci/remote-cache/BUILD.bazel
@@ -1,7 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "remote-cache_lib",
     srcs = [
         "main.go",
         "service.go",
@@ -9,15 +9,15 @@
     importpath = "code.hackerspace.pl/hscloud/devtools/ci/remote-cache",
     visibility = ["//visibility:private"],
     deps = [
-        "//go/mirko:go_default_library",
-        "@com_github_golang_glog//:go_default_library",
-        "@com_github_minio_minio_go_v7//:go_default_library",
-        "@com_github_minio_minio_go_v7//pkg/credentials:go_default_library",
+        "//go/mirko",
+        "@com_github_golang_glog//:glog",
+        "@com_github_minio_minio_go_v7//:minio-go",
+        "@com_github_minio_minio_go_v7//pkg/credentials",
     ],
 )
 
 go_binary(
     name = "remote-cache",
-    embed = [":go_default_library"],
+    embed = [":remote-cache_lib"],
     visibility = ["//visibility:public"],
 )
diff --git a/devtools/depotview/BUILD.bazel b/devtools/depotview/BUILD.bazel
index 833589d..255adb7 100644
--- a/devtools/depotview/BUILD.bazel
+++ b/devtools/depotview/BUILD.bazel
@@ -2,30 +2,30 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "depotview_lib",
     srcs = ["main.go"],
     importpath = "code.hackerspace.pl/hscloud/devtools/depotview",
     visibility = ["//visibility:private"],
     deps = [
-        "//devtools/depotview/proto:go_default_library",
-        "//devtools/depotview/service:go_default_library",
-        "//go/mirko:go_default_library",
-        "@com_github_golang_glog//:go_default_library",
+        "//devtools/depotview/proto",
+        "//devtools/depotview/service",
+        "//go/mirko",
+        "@com_github_golang_glog//:glog",
     ],
 )
 
 go_binary(
     name = "depotview",
-    embed = [":go_default_library"],
+    embed = [":depotview_lib"],
     visibility = ["//visibility:public"],
 )
 
 container_layer(
     name = "layer_bin",
+    directory = "/devtools/",
     files = [
         ":depotview",
     ],
-    directory = "/devtools/",
 )
 
 container_image(
@@ -38,8 +38,8 @@
 
 container_push(
     name = "push",
-    image = ":runtime",
     format = "Docker",
+    image = ":runtime",
     registry = "registry.k0.hswaw.net",
     repository = "q3k/depotview",
     tag = "{BUILD_TIMESTAMP}-{STABLE_GIT_COMMIT}",
diff --git a/devtools/depotview/proto/BUILD.bazel b/devtools/depotview/proto/BUILD.bazel
index 47df920..c061080 100644
--- a/devtools/depotview/proto/BUILD.bazel
+++ b/devtools/depotview/proto/BUILD.bazel
@@ -1,3 +1,4 @@
+load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
 
@@ -16,7 +17,7 @@
 )
 
 go_library(
-    name = "go_default_library",
+    name = "proto",
     embed = [":proto_go_proto"],
     importpath = "code.hackerspace.pl/hscloud/devtools/depotview/proto",
     visibility = ["//visibility:public"],
diff --git a/devtools/depotview/service/BUILD.bazel b/devtools/depotview/service/BUILD.bazel
index 056ec30..b2f70a6 100644
--- a/devtools/depotview/service/BUILD.bazel
+++ b/devtools/depotview/service/BUILD.bazel
@@ -1,7 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
-    name = "go_default_library",
+    name = "service",
     srcs = [
         "gerrit.go",
         "service.go",
@@ -9,23 +9,23 @@
     importpath = "code.hackerspace.pl/hscloud/devtools/depotview/service",
     visibility = ["//visibility:public"],
     deps = [
-        "//devtools/depotview/proto:go_default_library",
-        "@com_github_go_git_go_git_v5//:go_default_library",
-        "@com_github_go_git_go_git_v5//config:go_default_library",
-        "@com_github_go_git_go_git_v5//plumbing:go_default_library",
-        "@com_github_go_git_go_git_v5//plumbing/filemode:go_default_library",
-        "@com_github_go_git_go_git_v5//plumbing/object:go_default_library",
-        "@com_github_go_git_go_git_v5//storage:go_default_library",
-        "@com_github_go_git_go_git_v5//storage/memory:go_default_library",
-        "@com_github_golang_glog//:go_default_library",
-        "@org_golang_google_grpc//codes:go_default_library",
-        "@org_golang_google_grpc//status:go_default_library",
+        "//devtools/depotview/proto",
+        "@com_github_go_git_go_git_v5//:go-git",
+        "@com_github_go_git_go_git_v5//config",
+        "@com_github_go_git_go_git_v5//plumbing",
+        "@com_github_go_git_go_git_v5//plumbing/filemode",
+        "@com_github_go_git_go_git_v5//plumbing/object",
+        "@com_github_go_git_go_git_v5//storage",
+        "@com_github_go_git_go_git_v5//storage/memory",
+        "@com_github_golang_glog//:glog",
+        "@org_golang_google_grpc//codes",
+        "@org_golang_google_grpc//status",
     ],
 )
 
 go_test(
-    name = "go_default_test",
+    name = "service_test",
     srcs = ["service_test.go"],
-    embed = [":go_default_library"],
-    deps = ["//devtools/depotview/proto:go_default_library"],
+    embed = [":service"],
+    deps = ["//devtools/depotview/proto"],
 )
diff --git a/devtools/gerrit/BUILD b/devtools/gerrit/BUILD
index 9f089fd..79cf6cb 100644
--- a/devtools/gerrit/BUILD
+++ b/devtools/gerrit/BUILD
@@ -1,26 +1,26 @@
 load("@io_bazel_rules_docker//container:container.bzl", "container_image", "container_push")
 
 container_image(
-    name="with_plugins",
-    base="@gerrit-3.3.2//image",
-    files = [
-        "//devtools/gerrit/gerrit-oauth-provider:gerrit-oauth-provider",
-        "@com_googlesource_gerrit_plugin_owners//owners:owners.jar",
-    ],
+    name = "with_plugins",
+    base = "@gerrit-3.3.2//image",
     # 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
     # to overwrite plugins.
     directory = "/var/gerrit-plugins",
+    files = [
+        "//devtools/gerrit/gerrit-oauth-provider",
+        "@com_googlesource_gerrit_plugin_owners//owners:owners.jar",
+    ],
 )
 
 container_image(
     name = "with_theme",
     base = ":with_plugins",
+    directory = "/var/gerrit-theme",
     files = [
         "theme/etc/GerritSite.css",
         "theme/static/pepper-icon.png",
     ],
-    directory = "/var/gerrit-theme",
 )
 
 # Add gerrit 3.3.2 with backported fix. See org_q3k_gerrit_3_3_2_backport in
@@ -28,25 +28,25 @@
 # TODO(q3k): drop once gerrit > 3.3.2 lands.
 container_image(
     name = "with_gerrit_override",
-    base="with_theme",
+    base = "with_theme",
+    directory = "/var/gerrit/bin/",
     files = [
         "@org_q3k_gerrit_3_3_2_backport//file:gerrit.war",
     ],
-    directory = "/var/gerrit/bin/",
 )
 
 container_image(
-    name="3.3.2-r4",
-    base=":with_gerrit_override",
-    files = [":entrypoint.sh"],
+    name = "3.3.2-r4",
+    base = ":with_gerrit_override",
     directory = "/",
     entrypoint = ["/entrypoint.sh"],
+    files = [":entrypoint.sh"],
 )
 
 container_push(
     name = "push",
-    image = ":3.3.2-r4",
     format = "Docker",
+    image = ":3.3.2-r4",
     registry = "registry.k0.hswaw.net",
     repository = "q3k/gerrit",
     tag = "3.3.2-r4",
diff --git a/devtools/gerrit/gerrit-oauth-provider/BUILD b/devtools/gerrit/gerrit-oauth-provider/BUILD
index 413ef46..e19169f 100644
--- a/devtools/gerrit/gerrit-oauth-provider/BUILD
+++ b/devtools/gerrit/gerrit-oauth-provider/BUILD
@@ -25,15 +25,15 @@
     ],
 )
 
-junit_tests(
-    name = "gerrit-oauth-provider_tests",
-    srcs = glob(["src/test/java/**/*.java"]),
-    tags = ["oauth"],
-    deps = [
-        ":gerrit-oauth-provider__plugin_test_deps",
-        "@scribejava-core//jar",
-    ],
-)
+#junit_tests(
+#    name = "gerrit-oauth-provider_tests",
+#    srcs = glob(["src/test/java/**/*.java"]),
+#    tags = ["oauth"],
+#    deps = [
+#        ":gerrit-oauth-provider__plugin_test_deps",
+#        "@scribejava-core//jar",
+#    ],
+#)
 
 java_library(
     name = "gerrit-oauth-provider__plugin_test_deps",
diff --git a/devtools/hackdoc/BUILD.bazel b/devtools/hackdoc/BUILD.bazel
index 186b0ef..d3c4eea 100644
--- a/devtools/hackdoc/BUILD.bazel
+++ b/devtools/hackdoc/BUILD.bazel
@@ -2,7 +2,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "hackdoc_lib",
     srcs = [
         "helpers.go",
         "main.go",
@@ -11,30 +11,30 @@
     importpath = "code.hackerspace.pl/hscloud/devtools/hackdoc",
     visibility = ["//visibility:private"],
     deps = [
-        "//devtools/depotview/proto:go_default_library",
-        "//devtools/hackdoc/config:go_default_library",
-        "//devtools/hackdoc/source:go_default_library",
-        "//go/mirko:go_default_library",
-        "//go/pki:go_default_library",
-        "@com_github_gabriel_vasile_mimetype//:go_default_library",
-        "@com_github_golang_glog//:go_default_library",
-        "@in_gopkg_russross_blackfriday_v2//:go_default_library",
+        "//devtools/depotview/proto",
+        "//devtools/hackdoc/config",
+        "//devtools/hackdoc/source",
+        "//go/mirko",
+        "//go/pki",
+        "@com_github_gabriel_vasile_mimetype//:mimetype",
+        "@com_github_golang_glog//:glog",
+        "@com_github_russross_blackfriday_v2//:blackfriday",
         "@org_golang_google_grpc//:go_default_library",
     ],
 )
 
 go_binary(
     name = "hackdoc",
-    embed = [":go_default_library"],
+    embed = [":hackdoc_lib"],
     visibility = ["//visibility:public"],
 )
 
 container_layer(
     name = "layer_bin",
+    directory = "/devtools/",
     files = [
         ":hackdoc",
     ],
-    directory = "/devtools/",
 )
 
 container_image(
@@ -47,8 +47,8 @@
 
 container_push(
     name = "push",
-    image = ":runtime",
     format = "Docker",
+    image = ":runtime",
     registry = "registry.k0.hswaw.net",
     repository = "q3k/hackdoc",
     tag = "{BUILD_TIMESTAMP}-{STABLE_GIT_COMMIT}",
diff --git a/devtools/hackdoc/README.md b/devtools/hackdoc/README.md
index 7bf556a..1ac0b66 100644
--- a/devtools/hackdoc/README.md
+++ b/devtools/hackdoc/README.md
@@ -16,7 +16,7 @@
 Special Markdown
 ----------------
 
-We should be accepting a Somewhat Standard Subset Of Markdown. For reference, we're using the [blackfriday](https://godoc.org/gopkg.in/russross/blackfriday.v2) library with [CommonExtensions](https://godoc.org/gopkg.in/russross/blackfriday.v2#CommonExtensions) enabled.
+We should be accepting a Somewhat Standard Subset Of Markdown. For reference, we're using the [blackfriday](https://godoc.org/github.com/russross/blackfriday/v2) library with [CommonExtensions](https://godoc.org/github.com/russross/blackfriday/v2#CommonExtensions) enabled.
 
 In addition, we also support Table of Contents autorendering, just place the following anywhere in your document to render a TOC:
 
diff --git a/devtools/hackdoc/config/BUILD.bazel b/devtools/hackdoc/config/BUILD.bazel
index c5052c7..49f6d33 100644
--- a/devtools/hackdoc/config/BUILD.bazel
+++ b/devtools/hackdoc/config/BUILD.bazel
@@ -1,19 +1,19 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 
 go_library(
-    name = "go_default_library",
+    name = "config",
     srcs = ["config.go"],
     importpath = "code.hackerspace.pl/hscloud/devtools/hackdoc/config",
     visibility = ["//visibility:public"],
     deps = [
-        "//devtools/hackdoc/source:go_default_library",
-        "@com_github_burntsushi_toml//:go_default_library",
+        "//devtools/hackdoc/source",
+        "@com_github_burntsushi_toml//:toml",
     ],
 )
 
 go_test(
-    name = "go_default_test",
+    name = "config_test",
     srcs = ["config_test.go"],
-    embed = [":go_default_library"],
-    deps = ["@com_github_go_test_deep//:go_default_library"],
+    embed = [":config"],
+    deps = ["@com_github_go_test_deep//:deep"],
 )
diff --git a/devtools/hackdoc/markdown.go b/devtools/hackdoc/markdown.go
index a6f206d..1557af1 100644
--- a/devtools/hackdoc/markdown.go
+++ b/devtools/hackdoc/markdown.go
@@ -10,7 +10,7 @@
 
 	"github.com/gabriel-vasile/mimetype"
 	"github.com/golang/glog"
-	"gopkg.in/russross/blackfriday.v2"
+	"github.com/russross/blackfriday/v2"
 )
 
 // renderMarkdown renders markdown to HTML, replacing all relative (intra-hackdoc) links with version that have ref set.
diff --git a/devtools/hackdoc/source/BUILD.bazel b/devtools/hackdoc/source/BUILD.bazel
index f7f09c6..cbfc4a9 100644
--- a/devtools/hackdoc/source/BUILD.bazel
+++ b/devtools/hackdoc/source/BUILD.bazel
@@ -1,7 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "source",
     srcs = [
         "source.go",
         "source_depotview.go",
@@ -9,5 +9,5 @@
     ],
     importpath = "code.hackerspace.pl/hscloud/devtools/hackdoc/source",
     visibility = ["//visibility:public"],
-    deps = ["//devtools/depotview/proto:go_default_library"],
+    deps = ["//devtools/depotview/proto"],
 )
diff --git a/devtools/issues/b/BUILD.bazel b/devtools/issues/b/BUILD.bazel
index 36933d8..366d304 100644
--- a/devtools/issues/b/BUILD.bazel
+++ b/devtools/issues/b/BUILD.bazel
@@ -2,25 +2,25 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "b_lib",
     srcs = ["main.go"],
     importpath = "code.hackerspace.pl/hscloud/devtools/issues/b",
     visibility = ["//visibility:private"],
-    deps = ["@com_github_golang_glog//:go_default_library"],
+    deps = ["@com_github_golang_glog//:glog"],
 )
 
 go_binary(
     name = "b",
-    embed = [":go_default_library"],
+    embed = [":b_lib"],
     visibility = ["//visibility:public"],
 )
 
 container_layer(
     name = "layer_bin",
+    directory = "/devtools/issues/",
     files = [
         ":b",
     ],
-    directory = "/devtools/issues/",
 )
 
 container_image(
@@ -33,10 +33,9 @@
 
 container_push(
     name = "push",
-    image = ":runtime",
     format = "Docker",
+    image = ":runtime",
     registry = "registry.k0.hswaw.net",
     repository = "q3k/b",
     tag = "{BUILD_TIMESTAMP}-{STABLE_GIT_COMMIT}",
 )
-