diff --git a/bgpwtf/speedtest/BUILD.bazel b/bgpwtf/speedtest/BUILD.bazel
index cc431d0..7b5af44 100644
--- a/bgpwtf/speedtest/BUILD.bazel
+++ b/bgpwtf/speedtest/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@io_bazel_rules_docker//container:container.bzl", "container_image")
+load("@io_bazel_rules_docker//container:container.bzl", "container_image", "container_push")
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 load("@io_bazel_rules_go//extras:embed_data.bzl", "go_embed_data")
 
@@ -24,19 +24,11 @@
     entrypoint = ["/hscloud/backend"],
 )
 
-genrule(
-    name = "push_latest",
-    srcs = [":latest"],
-    outs = ["version.sh"],
-    executable = True,
-    cmd = """
-        local=bazel/bgpwtf/speedtest:latest
-        tag=$$(date +%s)
-        remote=registry.k0.hswaw.net/bgpwtf/speedtest:$$tag
-
-        docker tag $$local $$remote
-        docker push $$remote
-        echo -ne "#!/bin/sh\necho Pushed $$remote\n" > $(OUTS)
-    """,
+container_push(
+    name = "push",
+    image = ":latest",
+    format = "Docker",
+    registry = "registry.k0.hswaw.net",
+    repository = "q3k/speedetst",
+    tag = "{BUILD_TIMESTAMP}-{STABLE_GIT_COMMIT}",
 )
-