diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 48d59061f9..9b49f0bd5e 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -12,7 +12,7 @@ steps:
     plugins:
       - scionproto/metahook#v0.3.0:
           post-artifact: |
-            cat << EOF | buildkite-agent annotate --style "info"
+            cat << EOF | buildkite-agent annotate --style "info" --context "binaries"
             #### Build outputs
             - <a href="artifact://bazel-bin/scion.tar">SCION binaries</a>
             - <a href="artifact://bazel-bin/scion-ci.tar">SCION test tools and utilities</a>
@@ -36,7 +36,7 @@ steps:
     plugins:
       - scionproto/metahook#v0.3.0:
           post-artifact: |
-            cat << EOF | buildkite-agent annotate --style "info"
+            cat << EOF | buildkite-agent annotate --style "info" --context "packages"
             #### Packages :debian:
             - <a href="artifact://deb/scion-deb-amd64.tar">amd64</a>
             - <a href="artifact://deb/scion-deb-arm64.tar">arm64</a>
diff --git a/private/mgmtapi/api.bzl b/private/mgmtapi/api.bzl
index 4375430412..e9fc05144d 100644
--- a/private/mgmtapi/api.bzl
+++ b/private/mgmtapi/api.bzl
@@ -103,13 +103,13 @@ def openapi_generate_go(
         kwargs["out_" + typ] = typ + ".bzl.gen.go"
         write_files[typ + ".gen.go"] = src
 
-    _openapi_generate_go(
+    _target_platform_independent(
+        _openapi_generate_go,
         name = name,
         **kwargs
     )
 
-    _target_platform_independent(
-        write_source_files,
+    write_source_files(
         name = "write_files",
         files = write_files,
     )