diff --git a/bgpwtf/cccampix/BUILD b/bgpwtf/cccampix/BUILD
index 205289f..9e59dfb 100644
--- a/bgpwtf/cccampix/BUILD
+++ b/bgpwtf/cccampix/BUILD
@@ -1,32 +1,30 @@
 load("@io_bazel_rules_docker//container:container.bzl", "container_image", "container_layer", "container_push")
-load("@subpar//:subpar.bzl", "par_binary")
 load("@pydeps//:requirements.bzl", "requirement")
 
-par_binary(
+py_binary(
     name = "ripe-sync",
     srcs = [
         "ripe-sync.py",
     ],
+    legacy_create_init = False,
     deps = [
         requirement("requests"),
-        "//bgpwtf/cccampix/proto:ix_py_proto",
         "//bgpwtf/cccampix/proto:ix_grpc_proto",
+        "//bgpwtf/cccampix/proto:ix_py_proto",
     ],
-    legacy_create_init = False,
-    zip_safe = False,
 )
 
 container_layer(
     name = "layer_bin",
-    files = [
-        "//bgpwtf/cccampix:ripe-sync.par",
-        "//bgpwtf/cccampix/irr:irr",
-        "//bgpwtf/cccampix/pgpencryptor:pgpencryptor",
-        "//bgpwtf/cccampix/peeringdb:peeringdb",
-        "//bgpwtf/cccampix/verifier:verifier",
-        "//bgpwtf/cccampix/frontend:frontend.par",
-    ],
     directory = "/ix/",
+    files = [
+        "//bgpwtf/cccampix:ripe-sync",
+        "//bgpwtf/cccampix/frontend",
+        "//bgpwtf/cccampix/irr",
+        "//bgpwtf/cccampix/peeringdb",
+        "//bgpwtf/cccampix/pgpencryptor",
+        "//bgpwtf/cccampix/verifier",
+    ],
 )
 
 container_image(
@@ -41,8 +39,8 @@
 
 container_push(
     name = "push",
-    image = ":runtime",
     format = "Docker",
+    image = ":runtime",
     registry = "registry.k0.hswaw.net",
     repository = "bgpwtf/cccampix",
     tag = "{BUILD_TIMESTAMP}-{STABLE_GIT_COMMIT}",
diff --git a/bgpwtf/cccampix/birdie/BUILD.bazel b/bgpwtf/cccampix/birdie/BUILD.bazel
index 67fe480..5871af0 100644
--- a/bgpwtf/cccampix/birdie/BUILD.bazel
+++ b/bgpwtf/cccampix/birdie/BUILD.bazel
@@ -1,21 +1,22 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "birdie_lib",
     srcs = ["birdie.go"],
     importpath = "code.hackerspace.pl/hscloud/bgpwtf/cccampix/birdie",
     visibility = ["//visibility:private"],
     deps = [
-        "//bgpwtf/cccampix/proto:go_default_library",
-        "@com_github_golang_glog//:go_default_library",
+        "//bgpwtf/cccampix/proto",
+        "@com_github_golang_glog//:glog",
         "@org_golang_google_grpc//:go_default_library",
-        "@org_golang_google_grpc//credentials:go_default_library",
+        "@org_golang_google_grpc//credentials",
     ],
 )
 
 go_binary(
     name = "birdie",
-    embed = [":go_default_library"],
+    embed = [":birdie_lib"],
+    pure = "on",
     static = "on",
     visibility = ["//visibility:public"],
 )
diff --git a/bgpwtf/cccampix/frontend/BUILD.bazel b/bgpwtf/cccampix/frontend/BUILD.bazel
index f9bbd90..c7ea255 100644
--- a/bgpwtf/cccampix/frontend/BUILD.bazel
+++ b/bgpwtf/cccampix/frontend/BUILD.bazel
@@ -1,11 +1,10 @@
-load("@subpar//:subpar.bzl", "par_binary")
 load("@pydeps//:requirements.bzl", "requirement")
 
 py_library(
     name = "frontend_lib",
     srcs = [
-        "frontend.py",
         "channel.py",
+        "frontend.py",
     ],
     data = glob([
         "templates/**",
@@ -15,8 +14,8 @@
         requirement("flask"),
         requirement("werkzeug"),
         requirement("itsdangerous"),
-        "//bgpwtf/cccampix/proto:ix_py_proto",
         "//bgpwtf/cccampix/proto:ix_grpc_proto",
+        "//bgpwtf/cccampix/proto:ix_py_proto",
     ],
 )
 
@@ -31,22 +30,21 @@
     ],
 )
 
-par_binary(
+py_binary(
     name = "frontend",
-    main = "server.py",
     srcs = [
         "server.py",
     ],
+    legacy_create_init = False,
+    main = "server.py",
+    visibility = [
+        "//bgpwtf/cccampix:__pkg__",
+    ],
     deps = [
         ":frontend_lib",
         requirement("gevent"),
         requirement("gunicorn"),
         requirement("greenlet"),
     ],
-    visibility = [
-        "//bgpwtf/cccampix:__pkg__",
-    ],
-    legacy_create_init = False,
-    zip_safe = False,
     #no_remove = True,
 )
diff --git a/bgpwtf/cccampix/irr/BUILD.bazel b/bgpwtf/cccampix/irr/BUILD.bazel
index 64b8e32..bab9ee3 100644
--- a/bgpwtf/cccampix/irr/BUILD.bazel
+++ b/bgpwtf/cccampix/irr/BUILD.bazel
@@ -1,22 +1,22 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "irr_lib",
     srcs = ["main.go"],
     importpath = "code.hackerspace.pl/hscloud/bgpwtf/cccampix/irr",
     visibility = ["//visibility:private"],
     deps = [
-        "//bgpwtf/cccampix/irr/provider:go_default_library",
-        "//bgpwtf/cccampix/proto:go_default_library",
-        "//go/mirko: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",
+        "//bgpwtf/cccampix/irr/provider",
+        "//bgpwtf/cccampix/proto",
+        "//go/mirko",
+        "@com_github_golang_glog//:glog",
+        "@org_golang_google_grpc//codes",
+        "@org_golang_google_grpc//status",
     ],
 )
 
 go_binary(
     name = "irr",
-    embed = [":go_default_library"],
+    embed = [":irr_lib"],
     visibility = ["//visibility:public"],
 )
diff --git a/bgpwtf/cccampix/irr/provider/BUILD.bazel b/bgpwtf/cccampix/irr/provider/BUILD.bazel
index 2b19f00..222a379 100644
--- a/bgpwtf/cccampix/irr/provider/BUILD.bazel
+++ b/bgpwtf/cccampix/irr/provider/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 = "provider",
     srcs = [
         "arin.go",
         "iana.go",
@@ -12,21 +12,21 @@
     importpath = "code.hackerspace.pl/hscloud/bgpwtf/cccampix/irr/provider",
     visibility = ["//visibility:public"],
     deps = [
-        "//bgpwtf/cccampix/irr/whois:go_default_library",
-        "//bgpwtf/cccampix/proto:go_default_library",
-        "@com_github_golang_collections_go_datastructures//augmentedtree: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",
+        "//bgpwtf/cccampix/irr/whois",
+        "//bgpwtf/cccampix/proto",
+        "@com_github_golang_collections_go_datastructures//augmentedtree",
+        "@com_github_golang_glog//:glog",
+        "@org_golang_google_grpc//codes",
+        "@org_golang_google_grpc//status",
     ],
 )
 
 go_test(
-    name = "go_default_test",
+    name = "provider_test",
     srcs = ["rpsl_test.go"],
-    embed = [":go_default_library"],
+    embed = [":provider"],
     deps = [
-        "//bgpwtf/cccampix/proto:go_default_library",
-        "@com_github_go_test_deep//:go_default_library",
+        "//bgpwtf/cccampix/proto",
+        "@com_github_go_test_deep//:deep",
     ],
 )
diff --git a/bgpwtf/cccampix/irr/whois/BUILD.bazel b/bgpwtf/cccampix/irr/whois/BUILD.bazel
index d30237d..a37bc5d 100644
--- a/bgpwtf/cccampix/irr/whois/BUILD.bazel
+++ b/bgpwtf/cccampix/irr/whois/BUILD.bazel
@@ -1,7 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "whois",
     srcs = ["whois.go"],
     importpath = "code.hackerspace.pl/hscloud/bgpwtf/cccampix/irr/whois",
     visibility = ["//visibility:public"],
diff --git a/bgpwtf/cccampix/octorpki/BUILD.bazel b/bgpwtf/cccampix/octorpki/BUILD.bazel
index e06d752..ad2abfd 100644
--- a/bgpwtf/cccampix/octorpki/BUILD.bazel
+++ b/bgpwtf/cccampix/octorpki/BUILD.bazel
@@ -2,17 +2,17 @@
 
 container_layer(
     name = "layer_bin",
-    files = [
-        "@com_github_cloudflare_cfrpki//cmd/octorpki:octorpki",
-        "entrypoint.sh",
-    ],
     directory = "/octorpki/",
+    files = [
+        "entrypoint.sh",
+        "@com_github_cloudflare_cfrpki//cmd/octorpki",
+    ],
     visibility = ["//bgpwtf/cccampix:__pkg__"],
 )
 
 container_layer(
     name = "layer_tals",
-    files = glob(["tals/*"]),
     directory = "/octorpki/tals/",
+    files = glob(["tals/*"]),
     visibility = ["//bgpwtf/cccampix:__pkg__"],
 )
diff --git a/bgpwtf/cccampix/octorpki/tools.go b/bgpwtf/cccampix/octorpki/tools.go
new file mode 100644
index 0000000..e26209b
--- /dev/null
+++ b/bgpwtf/cccampix/octorpki/tools.go
@@ -0,0 +1,8 @@
+//go:build tools
+
+// +tools
+package octorpki
+
+import (
+	_ "github.com/cloudflare/cfrpki/cmd/octorpki"
+)
diff --git a/bgpwtf/cccampix/peeringdb/BUILD.bazel b/bgpwtf/cccampix/peeringdb/BUILD.bazel
index 22c90e3..33d87b6 100644
--- a/bgpwtf/cccampix/peeringdb/BUILD.bazel
+++ b/bgpwtf/cccampix/peeringdb/BUILD.bazel
@@ -1,22 +1,22 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "peeringdb_lib",
     srcs = ["main.go"],
     importpath = "code.hackerspace.pl/hscloud/bgpwtf/cccampix/peeringdb",
     visibility = ["//visibility:private"],
     deps = [
-        "//bgpwtf/cccampix/peeringdb/schema:go_default_library",
-        "//bgpwtf/cccampix/proto:go_default_library",
-        "//go/mirko: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",
+        "//bgpwtf/cccampix/peeringdb/schema",
+        "//bgpwtf/cccampix/proto",
+        "//go/mirko",
+        "@com_github_golang_glog//:glog",
+        "@org_golang_google_grpc//codes",
+        "@org_golang_google_grpc//status",
     ],
 )
 
 go_binary(
     name = "peeringdb",
-    embed = [":go_default_library"],
+    embed = [":peeringdb_lib"],
     visibility = ["//visibility:public"],
 )
diff --git a/bgpwtf/cccampix/peeringdb/schema/BUILD.bazel b/bgpwtf/cccampix/peeringdb/schema/BUILD.bazel
index 8eded08..124965c 100644
--- a/bgpwtf/cccampix/peeringdb/schema/BUILD.bazel
+++ b/bgpwtf/cccampix/peeringdb/schema/BUILD.bazel
@@ -1,7 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "schema",
     srcs = [
         "schema.go",
         "urls.go",
diff --git a/bgpwtf/cccampix/pgpencryptor/BUILD.bazel b/bgpwtf/cccampix/pgpencryptor/BUILD.bazel
index 2596087..6e808dd 100644
--- a/bgpwtf/cccampix/pgpencryptor/BUILD.bazel
+++ b/bgpwtf/cccampix/pgpencryptor/BUILD.bazel
@@ -1,25 +1,25 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "pgpencryptor_lib",
     srcs = ["main.go"],
     importpath = "code.hackerspace.pl/hscloud/bgpwtf/cccampix/pgpencryptor",
     visibility = ["//visibility:private"],
     deps = [
-        "//bgpwtf/cccampix/pgpencryptor/gpg:go_default_library",
-        "//bgpwtf/cccampix/pgpencryptor/hkp:go_default_library",
-        "//bgpwtf/cccampix/pgpencryptor/model:go_default_library",
-        "//bgpwtf/cccampix/proto:go_default_library",
-        "//go/mirko:go_default_library",
-        "@com_github_golang_glog//:go_default_library",
-        "@com_github_lib_pq//:go_default_library",
-        "@org_golang_google_grpc//codes:go_default_library",
-        "@org_golang_google_grpc//status:go_default_library",
+        "//bgpwtf/cccampix/pgpencryptor/gpg",
+        "//bgpwtf/cccampix/pgpencryptor/hkp",
+        "//bgpwtf/cccampix/pgpencryptor/model",
+        "//bgpwtf/cccampix/proto",
+        "//go/mirko",
+        "@com_github_golang_glog//:glog",
+        "@com_github_lib_pq//:pq",
+        "@org_golang_google_grpc//codes",
+        "@org_golang_google_grpc//status",
     ],
 )
 
 go_binary(
     name = "pgpencryptor",
-    embed = [":go_default_library"],
+    embed = [":pgpencryptor_lib"],
     visibility = ["//visibility:public"],
 )
diff --git a/bgpwtf/cccampix/pgpencryptor/gpg/BUILD.bazel b/bgpwtf/cccampix/pgpencryptor/gpg/BUILD.bazel
index dbca7db..f80b49a 100644
--- a/bgpwtf/cccampix/pgpencryptor/gpg/BUILD.bazel
+++ b/bgpwtf/cccampix/pgpencryptor/gpg/BUILD.bazel
@@ -1,7 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "gpg",
     srcs = ["gpg.go"],
     importpath = "code.hackerspace.pl/hscloud/bgpwtf/cccampix/pgpencryptor/gpg",
     visibility = ["//visibility:public"],
diff --git a/bgpwtf/cccampix/pgpencryptor/hkp/BUILD.bazel b/bgpwtf/cccampix/pgpencryptor/hkp/BUILD.bazel
index a2377da..78ccce6 100644
--- a/bgpwtf/cccampix/pgpencryptor/hkp/BUILD.bazel
+++ b/bgpwtf/cccampix/pgpencryptor/hkp/BUILD.bazel
@@ -1,7 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "hkp",
     srcs = ["hkp.go"],
     importpath = "code.hackerspace.pl/hscloud/bgpwtf/cccampix/pgpencryptor/hkp",
     visibility = ["//visibility:public"],
diff --git a/bgpwtf/cccampix/pgpencryptor/model/BUILD.bazel b/bgpwtf/cccampix/pgpencryptor/model/BUILD.bazel
index b8cd8f4..a274e6f 100644
--- a/bgpwtf/cccampix/pgpencryptor/model/BUILD.bazel
+++ b/bgpwtf/cccampix/pgpencryptor/model/BUILD.bazel
@@ -1,7 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "model",
     srcs = [
         "model.go",
         "pgp.go",
@@ -10,10 +10,10 @@
     importpath = "code.hackerspace.pl/hscloud/bgpwtf/cccampix/pgpencryptor/model",
     visibility = ["//visibility:public"],
     deps = [
-        "//bgpwtf/cccampix/pgpencryptor/model/migrations:go_default_library",
-        "@com_github_golang_migrate_migrate_v4//:go_default_library",
-        "@com_github_golang_migrate_migrate_v4//database/cockroachdb:go_default_library",
-        "@com_github_jmoiron_sqlx//:go_default_library",
-        "@com_github_lib_pq//:go_default_library",
+        "//bgpwtf/cccampix/pgpencryptor/model/migrations",
+        "@com_github_golang_migrate_migrate_v4//:migrate",
+        "@com_github_golang_migrate_migrate_v4//database/cockroachdb",
+        "@com_github_jmoiron_sqlx//:sqlx",
+        "@com_github_lib_pq//:pq",
     ],
 )
diff --git a/bgpwtf/cccampix/pgpencryptor/model/migrations/BUILD.bazel b/bgpwtf/cccampix/pgpencryptor/model/migrations/BUILD.bazel
index e6c3bb0..31efba9 100644
--- a/bgpwtf/cccampix/pgpencryptor/model/migrations/BUILD.bazel
+++ b/bgpwtf/cccampix/pgpencryptor/model/migrations/BUILD.bazel
@@ -4,12 +4,12 @@
 go_embed_data(
     name = "migrations_data",
     srcs = glob(["*.sql"]),
-    package = "migrations",
     flatten = True,
+    package = "migrations",
 )
 
 go_library(
-    name = "go_default_library",
+    name = "migrations",
     srcs = [
         "migrations.go",
         ":migrations_data",  # keep
@@ -17,7 +17,7 @@
     importpath = "code.hackerspace.pl/hscloud/bgpwtf/cccampix/pgpencryptor/model/migrations",
     visibility = ["//bgpwtf/cccampix/pgpencryptor/model:__subpackages__"],
     deps = [
-        "//go/mirko:go_default_library",
-        "@com_github_golang_migrate_migrate_v4//:go_default_library",
+        "//go/mirko",
+        "@com_github_golang_migrate_migrate_v4//:migrate",
     ],
 )
diff --git a/bgpwtf/cccampix/proto/BUILD.bazel b/bgpwtf/cccampix/proto/BUILD.bazel
index 740fef7..0339039 100644
--- a/bgpwtf/cccampix/proto/BUILD.bazel
+++ b/bgpwtf/cccampix/proto/BUILD.bazel
@@ -1,7 +1,7 @@
+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")
-load("@com_github_grpc_grpc//bazel:python_rules.bzl", "py_proto_library", "py_grpc_library")
-
+load("@com_github_grpc_grpc//bazel:python_rules.bzl", "py_grpc_library", "py_proto_library")
 
 proto_library(
     name = "ix_proto",
@@ -18,7 +18,7 @@
 )
 
 go_library(
-    name = "go_default_library",
+    name = "proto",
     embed = [":ix_go_proto"],
     importpath = "code.hackerspace.pl/hscloud/bgpwtf/cccampix/proto",
     visibility = ["//visibility:public"],
@@ -26,13 +26,13 @@
 
 py_proto_library(
     name = "ix_py_proto",
-    deps = [":ix_proto"],
     visibility = ["//visibility:public"],
+    deps = [":ix_proto"],
 )
 
 py_grpc_library(
     name = "ix_grpc_proto",
     srcs = [":ix_proto"],
-    deps = [":ix_py_proto"],
     visibility = ["//visibility:public"],
+    deps = [":ix_py_proto"],
 )
diff --git a/bgpwtf/cccampix/verifier/BUILD.bazel b/bgpwtf/cccampix/verifier/BUILD.bazel
index dc9bf22..b77fd1c 100644
--- a/bgpwtf/cccampix/verifier/BUILD.bazel
+++ b/bgpwtf/cccampix/verifier/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 = "verifier_lib",
     srcs = [
         "main.go",
         "processor_irr.go",
@@ -17,24 +17,24 @@
     importpath = "code.hackerspace.pl/hscloud/bgpwtf/cccampix/verifier",
     visibility = ["//visibility:private"],
     deps = [
-        "//bgpwtf/cccampix/proto:go_default_library",
-        "//bgpwtf/cccampix/verifier/model:go_default_library",
-        "//go/mirko:go_default_library",
-        "//go/pki:go_default_library",
-        "//go/statusz:go_default_library",
-        "@com_github_dustin_go_humanize//:go_default_library",
-        "@com_github_golang_glog//:go_default_library",
-        "@com_github_lib_pq//:go_default_library",
-        "@com_github_sethvargo_go_password//password:go_default_library",
+        "//bgpwtf/cccampix/proto",
+        "//bgpwtf/cccampix/verifier/model",
+        "//go/mirko",
+        "//go/pki",
+        "//go/statusz",
+        "@com_github_dustin_go_humanize//:go-humanize",
+        "@com_github_golang_glog//:glog",
+        "@com_github_lib_pq//:pq",
+        "@com_github_sethvargo_go_password//password",
         "@org_golang_google_grpc//:go_default_library",
-        "@org_golang_google_grpc//codes:go_default_library",
-        "@org_golang_google_grpc//status:go_default_library",
-        "@org_golang_x_net//trace:go_default_library",
+        "@org_golang_google_grpc//codes",
+        "@org_golang_google_grpc//status",
+        "@org_golang_x_net//trace",
     ],
 )
 
 go_binary(
     name = "verifier",
-    embed = [":go_default_library"],
+    embed = [":verifier_lib"],
     visibility = ["//visibility:public"],
 )
diff --git a/bgpwtf/cccampix/verifier/model/BUILD.bazel b/bgpwtf/cccampix/verifier/model/BUILD.bazel
index bff1eeb..4364135 100644
--- a/bgpwtf/cccampix/verifier/model/BUILD.bazel
+++ b/bgpwtf/cccampix/verifier/model/BUILD.bazel
@@ -1,7 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "model",
     srcs = [
         "allowed_prefixes.go",
         "checkable_peers.go",
@@ -17,12 +17,12 @@
     importpath = "code.hackerspace.pl/hscloud/bgpwtf/cccampix/verifier/model",
     visibility = ["//visibility:public"],
     deps = [
-        "//bgpwtf/cccampix/proto:go_default_library",
-        "//bgpwtf/cccampix/verifier/model/migrations:go_default_library",
-        "@com_github_golang_glog//:go_default_library",
-        "@com_github_golang_migrate_migrate_v4//:go_default_library",
-        "@com_github_golang_migrate_migrate_v4//database/cockroachdb:go_default_library",
-        "@com_github_jmoiron_sqlx//:go_default_library",
-        "@com_github_lib_pq//:go_default_library",
+        "//bgpwtf/cccampix/proto",
+        "//bgpwtf/cccampix/verifier/model/migrations",
+        "@com_github_golang_glog//:glog",
+        "@com_github_golang_migrate_migrate_v4//:migrate",
+        "@com_github_golang_migrate_migrate_v4//database/cockroachdb",
+        "@com_github_jmoiron_sqlx//:sqlx",
+        "@com_github_lib_pq//:pq",
     ],
 )
diff --git a/bgpwtf/cccampix/verifier/model/migrations/BUILD.bazel b/bgpwtf/cccampix/verifier/model/migrations/BUILD.bazel
index b20d35f..da8596e 100644
--- a/bgpwtf/cccampix/verifier/model/migrations/BUILD.bazel
+++ b/bgpwtf/cccampix/verifier/model/migrations/BUILD.bazel
@@ -4,12 +4,12 @@
 go_embed_data(
     name = "migrations_data",
     srcs = glob(["*.sql"]),
-    package = "migrations",
     flatten = True,
+    package = "migrations",
 )
 
 go_library(
-    name = "go_default_library",
+    name = "migrations",
     srcs = [
         "migrations.go",
         ":migrations_data",  # keep
@@ -17,7 +17,7 @@
     importpath = "code.hackerspace.pl/hscloud/bgpwtf/cccampix/verifier/model/migrations",
     visibility = ["//bgpwtf/cccampix/verifier/model:__subpackages__"],
     deps = [
-        "//go/mirko:go_default_library",
-        "@com_github_golang_migrate_migrate_v4//:go_default_library",
+        "//go/mirko",
+        "@com_github_golang_migrate_migrate_v4//:migrate",
     ],
 )
diff --git a/bgpwtf/invoice/BUILD.bazel b/bgpwtf/invoice/BUILD.bazel
index 950474e..461af84 100644
--- a/bgpwtf/invoice/BUILD.bazel
+++ b/bgpwtf/invoice/BUILD.bazel
@@ -1,7 +1,7 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library", "go_test")
 
 go_library(
-    name = "go_default_library",
+    name = "invoice_lib",
     srcs = [
         "calc.go",
         "main.go",
@@ -13,27 +13,28 @@
     importpath = "code.hackerspace.pl/hscloud/bgpwtf/invoice",
     visibility = ["//visibility:private"],
     deps = [
-        "//bgpwtf/invoice/proto:go_default_library",
-        "//bgpwtf/invoice/templates:go_default_library",
-        "//go/mirko:go_default_library",
-        "//go/statusz:go_default_library",
-        "@com_github_golang_glog//:go_default_library",
+        "//bgpwtf/invoice/proto",
+        "//bgpwtf/invoice/templates",
+        "//go/mirko",
+        "//go/statusz",
+        "@com_github_golang_glog//:glog",
         "@com_github_golang_protobuf//proto:go_default_library",
-        "@com_github_mattn_go_sqlite3//:go_default_library",
-        "@com_github_sebastiaanklippert_go_wkhtmltopdf//:go_default_library",
-        "@org_golang_google_grpc//codes:go_default_library",
-        "@org_golang_google_grpc//status:go_default_library",
+        "@com_github_mattn_go_sqlite3//:go-sqlite3",
+        "@com_github_sebastiaanklippert_go_wkhtmltopdf//:go-wkhtmltopdf",
+        "@org_golang_google_grpc//codes",
+        "@org_golang_google_grpc//status",
     ],
 )
 
 go_binary(
     name = "invoice",
-    embed = [":go_default_library"],
+    embed = [":invoice_lib"],
     visibility = ["//visibility:public"],
 )
 
 go_test(
-    name = "go_default_test",
+    name = "invoice_test",
     srcs = ["calc_test.go"],
-    embed = [":go_default_library"],
+    embed = [":invoice_lib"],
+    deps = ["//bgpwtf/invoice/proto"],
 )
diff --git a/bgpwtf/invoice/proto/BUILD.bazel b/bgpwtf/invoice/proto/BUILD.bazel
index a1a7033..6eff00e 100644
--- a/bgpwtf/invoice/proto/BUILD.bazel
+++ b/bgpwtf/invoice/proto/BUILD.bazel
@@ -20,7 +20,7 @@
 )
 
 go_library(
-    name = "go_default_library",
+    name = "proto",
     embed = [":proto_go_proto"],
     importpath = "code.hackerspace.pl/hscloud/bgpwtf/invoice/proto",
     visibility = ["//visibility:public"],
diff --git a/bgpwtf/invoice/recurrent/BUILD.bazel b/bgpwtf/invoice/recurrent/BUILD.bazel
index b9fc578..2e456ee 100644
--- a/bgpwtf/invoice/recurrent/BUILD.bazel
+++ b/bgpwtf/invoice/recurrent/BUILD.bazel
@@ -1,14 +1,14 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
 
 go_library(
-    name = "go_default_library",
+    name = "recurrent_lib",
     srcs = ["main.go"],
     importpath = "code.hackerspace.pl/hscloud/bgpwtf/invoice/recurrent",
     visibility = ["//visibility:private"],
     deps = [
-        "//bgpwtf/invoice/proto:go_default_library",
-        "//go/pki:go_default_library",
-        "@com_github_golang_glog//:go_default_library",
+        "//bgpwtf/invoice/proto",
+        "//go/pki",
+        "@com_github_golang_glog//:glog",
         "@com_github_golang_protobuf//proto:go_default_library",
         "@org_golang_google_grpc//:go_default_library",
     ],
@@ -16,6 +16,6 @@
 
 go_binary(
     name = "recurrent",
-    embed = [":go_default_library"],
+    embed = [":recurrent_lib"],
     visibility = ["//visibility:public"],
 )
diff --git a/bgpwtf/invoice/render.go b/bgpwtf/invoice/render.go
index db5c151..dc80e41 100644
--- a/bgpwtf/invoice/render.go
+++ b/bgpwtf/invoice/render.go
@@ -7,7 +7,7 @@
 	"strings"
 	"time"
 
-	wkhtml "github.com/sebastiaanklippert/go-wkhtmltopdf"
+	wkhtml "github.com/SebastiaanKlippert/go-wkhtmltopdf"
 
 	pb "code.hackerspace.pl/hscloud/bgpwtf/invoice/proto"
 	"code.hackerspace.pl/hscloud/bgpwtf/invoice/templates"
diff --git a/bgpwtf/invoice/templates/BUILD.bazel b/bgpwtf/invoice/templates/BUILD.bazel
index 4756da4..4b7baa3 100644
--- a/bgpwtf/invoice/templates/BUILD.bazel
+++ b/bgpwtf/invoice/templates/BUILD.bazel
@@ -9,7 +9,7 @@
 )
 
 go_library(
-    name = "go_default_library",
+    name = "templates",
     srcs = [
         ":templates_bindata",  # keep
     ],
diff --git a/bgpwtf/speedtest/BUILD.bazel b/bgpwtf/speedtest/BUILD.bazel
index 7b5af44..579a8ee 100644
--- a/bgpwtf/speedtest/BUILD.bazel
+++ b/bgpwtf/speedtest/BUILD.bazel
@@ -4,7 +4,11 @@
 
 go_embed_data(
     name = "static",
-    srcs = ["index.html", "speedtest.js", "speedtest_worker.js"],
+    srcs = [
+        "index.html",
+        "speedtest.js",
+        "speedtest_worker.js",
+    ],
     package = "static",
 )
 
@@ -17,17 +21,17 @@
 )
 
 container_image(
-    name="latest",
-    base="@prodimage-bionic//image",
-    files = ["//bgpwtf/speedtest/backend:backend"],
+    name = "latest",
+    base = "@prodimage-bionic//image",
     directory = "/hscloud",
     entrypoint = ["/hscloud/backend"],
+    files = ["//bgpwtf/speedtest/backend"],
 )
 
 container_push(
     name = "push",
-    image = ":latest",
     format = "Docker",
+    image = ":latest",
     registry = "registry.k0.hswaw.net",
     repository = "q3k/speedetst",
     tag = "{BUILD_TIMESTAMP}-{STABLE_GIT_COMMIT}",
diff --git a/bgpwtf/speedtest/backend/BUILD.bazel b/bgpwtf/speedtest/backend/BUILD.bazel
index 54ea2f6..afd0851 100644
--- a/bgpwtf/speedtest/backend/BUILD.bazel
+++ b/bgpwtf/speedtest/backend/BUILD.bazel
@@ -1,24 +1,24 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library", "go_test")
 
 go_library(
-    name = "go_default_library",
+    name = "backend_lib",
     srcs = ["main.go"],
     importpath = "code.hackerspace.pl/hscloud/bgpwtf/speedtest/backend",
     visibility = ["//visibility:private"],
     deps = [
-        "@com_github_golang_glog//:go_default_library",
-        "//bgpwtf/speedtest:static_go", # keep
+        "//bgpwtf/speedtest:static_go",  # keep
+        "@com_github_golang_glog//:glog",
     ],
 )
 
 go_binary(
     name = "backend",
-    embed = [":go_default_library"],
+    embed = [":backend_lib"],
     visibility = ["//visibility:public"],
 )
 
 go_test(
-    name = "go_default_test",
+    name = "backend_test",
     srcs = ["main_test.go"],
-    embed = [":go_default_library"],
+    embed = [":backend_lib"],
 )