diff --git a/tools/testing/gatekeeper/required-tests.yaml b/tools/testing/gatekeeper/required-tests.yaml
index 5abdeccc60..0ec088916d 100644
--- a/tools/testing/gatekeeper/required-tests.yaml
+++ b/tools/testing/gatekeeper/required-tests.yaml
@@ -129,73 +129,72 @@ mapping:
     # Checks that static checks are passing
     names:
       # static-checks.yaml (build-checks.yaml)
-      - Static checks / build-checks / check (agent-ctl, make check)
-      - Static checks / build-checks / check (agent-ctl, make test)
-      - Static checks / build-checks / check (agent-ctl, make vendor)
-      - Static checks / build-checks / check (agent-ctl, sudo -E PATH="$PATH" make test)
-      - Static checks / build-checks / check (agent, make check)
-      - Static checks / build-checks / check (agent, make test)
-      - Static checks / build-checks / check (agent, make vendor)
-      - Static checks / build-checks / check (agent, sudo -E PATH="$PATH" make test)
-      - Static checks / build-checks / check (dragonball, make check)
-      - Static checks / build-checks / check (dragonball, make test)
-      - Static checks / build-checks / check (dragonball, make vendor)
-      - Static checks / build-checks / check (dragonball, sudo -E PATH="$PATH" make test)
-      - Static checks / build-checks / check (genpolicy, make check)
-      - Static checks / build-checks / check (genpolicy, make test)
-      - Static checks / build-checks / check (genpolicy, make vendor)
-      - Static checks / build-checks / check (genpolicy, sudo -E PATH="$PATH" make test)
-      - Static checks / build-checks / check (kata-ctl, make check)
-      - Static checks / build-checks / check (kata-ctl, make test)
-      - Static checks / build-checks / check (kata-ctl, make vendor)
-      - Static checks / build-checks / check (kata-ctl, sudo -E PATH="$PATH" make test)
-      - Static checks / build-checks / check (runtime-rs, make check)
-      - Static checks / build-checks / check (runtime-rs, make test)
-      - Static checks / build-checks / check (runtime-rs, make vendor)
-      - Static checks / build-checks / check (runtime-rs, sudo -E PATH="$PATH" make test)
-      - Static checks / build-checks / check (runtime, make check)
-      - Static checks / build-checks / check (runtime, make test)
-      - Static checks / build-checks / check (runtime, make vendor)
-      - Static checks / build-checks / check (runtime, sudo -E PATH="$PATH" make test)
-      - Static checks / build-checks / check (trace-forwarder, make check)
-      - Static checks / build-checks / check (trace-forwarder, make test)
-      - Static checks / build-checks / check (trace-forwarder, make vendor)
-      - Static checks / build-checks / check (trace-forwarder, sudo -E PATH="$PATH" make test)
+      - Static checks / build-checks / check (make check, agent-ctl, src/tools/agent-ctl, rust, protobuf-compiler, clang)
+      - Static checks / build-checks / check (make check, agent, src/agent, rust, libdevmapper, libseccomp, protobuf-compiler, clang)
+      - Static checks / build-checks / check (make check, dragonball, src/dragonball, rust)
+      - Static checks / build-checks / check (make check, genpolicy, src/tools/genpolicy, rust, protobuf-compiler)
+      - Static checks / build-checks / check (make check, kata-ctl, src/tools/kata-ctl, rust)
+      - Static checks / build-checks / check (make check, runtime-rs, src/runtime-rs, rust)
+      - Static checks / build-checks / check (make check, runtime, src/runtime, golang, XDG_RUNTIME_DIR)
+      - Static checks / build-checks / check (make check, trace-forwarder, src/tools/trace-forwarder, rust)
+      - Static checks / build-checks / check (make test, agent-ctl, src/tools/agent-ctl, rust, protobuf-compiler, clang)
+      - Static checks / build-checks / check (make test, agent, src/agent, rust, libdevmapper, libseccomp, protobuf-compiler, clang)
+      - Static checks / build-checks / check (make test, dragonball, src/dragonball, rust)
+      - Static checks / build-checks / check (make test, genpolicy, src/tools/genpolicy, rust, protobuf-compiler)
+      - Static checks / build-checks / check (make test, kata-ctl, src/tools/kata-ctl, rust)
+      - Static checks / build-checks / check (make test, runtime-rs, src/runtime-rs, rust)
+      - Static checks / build-checks / check (make test, runtime, src/runtime, golang, XDG_RUNTIME_DIR)
+      - Static checks / build-checks / check (make test, trace-forwarder, src/tools/trace-forwarder, rust)
+      - Static checks / build-checks / check (make vendor, agent-ctl, src/tools/agent-ctl, rust, protobuf-compiler, clang)
+      - Static checks / build-checks / check (make vendor, agent, src/agent, rust, libdevmapper, libseccomp, protobuf-compiler, clang)
+      - Static checks / build-checks / check (make vendor, dragonball, src/dragonball, rust)
+      - Static checks / build-checks / check (make vendor, genpolicy, src/tools/genpolicy, rust, protobuf-compiler)
+      - Static checks / build-checks / check (make vendor, kata-ctl, src/tools/kata-ctl, rust)
+      - Static checks / build-checks / check (make vendor, runtime-rs, src/runtime-rs, rust)
+      - Static checks / build-checks / check (make vendor, runtime, src/runtime, golang, XDG_RUNTIME_DIR)
+      - Static checks / build-checks / check (make vendor, trace-forwarder, src/tools/trace-forwarder, rust)
+      - Static checks / build-checks / check (sudo -E PATH="$PATH" make test, agent-ctl, src/tools/agent-ctl, rust, protobuf-compiler, c...
+      - Static checks / build-checks / check (sudo -E PATH="$PATH" make test, agent, src/agent, rust, libdevmapper, libseccomp, protobuf...
+      - Static checks / build-checks / check (sudo -E PATH="$PATH" make test, dragonball, src/dragonball, rust)
+      - Static checks / build-checks / check (sudo -E PATH="$PATH" make test, genpolicy, src/tools/genpolicy, rust, protobuf-compiler)
+      - Static checks / build-checks / check (sudo -E PATH="$PATH" make test, kata-ctl, src/tools/kata-ctl, rust)
+      - Static checks / build-checks / check (sudo -E PATH="$PATH" make test, runtime-rs, src/runtime-rs, rust)
+      - Static checks / build-checks / check (sudo -E PATH="$PATH" make test, runtime, src/runtime, golang, XDG_RUNTIME_DIR)
+      - Static checks / build-checks / check (sudo -E PATH="$PATH" make test, trace-forwarder, src/tools/trace-forwarder, rust)
       - Static checks / build-checks-depending-on-kvm (runtime-rs)
       - Static checks / check-kernel-config-version
       - Static checks / static-checks (make static-checks)
       # static-checks-self-hosted.yaml
-      - Static checks self-hosted / build-checks (s390x) / check (agent-ctl, make check)
-      - Static checks self-hosted / build-checks (s390x) / check (agent-ctl, make test)
-      - Static checks self-hosted / build-checks (s390x) / check (agent-ctl, make vendor)
-      - Static checks self-hosted / build-checks (s390x) / check (agent-ctl, sudo -E PATH="$PATH" make test)
-      - Static checks self-hosted / build-checks (s390x) / check (agent, make check)
-      - Static checks self-hosted / build-checks (s390x) / check (agent, make test)
-      - Static checks self-hosted / build-checks (s390x) / check (agent, make vendor)
-      - Static checks self-hosted / build-checks (s390x) / check (agent, sudo -E PATH="$PATH" make test)
-      - Static checks self-hosted / build-checks (s390x) / check (dragonball, make check)
-      - Static checks self-hosted / build-checks (s390x) / check (dragonball, make test)
-      - Static checks self-hosted / build-checks (s390x) / check (dragonball, make vendor)
-      - Static checks self-hosted / build-checks (s390x) / check (dragonball, sudo -E PATH="$PATH" make test)
-      - Static checks self-hosted / build-checks (s390x) / check (genpolicy, make check)
-      - Static checks self-hosted / build-checks (s390x) / check (genpolicy, make test)
-      - Static checks self-hosted / build-checks (s390x) / check (genpolicy, make vendor)
-      - Static checks self-hosted / build-checks (s390x) / check (genpolicy, sudo -E PATH="$PATH" make test)
-      - Static checks self-hosted / build-checks (s390x) / check (kata-ctl, make check)
-      - Static checks self-hosted / build-checks (s390x) / check (kata-ctl, make test)
-      - Static checks self-hosted / build-checks (s390x) / check (kata-ctl, make vendor)
-      - Static checks self-hosted / build-checks (s390x) / check (kata-ctl, sudo -E PATH="$PATH" make test)
-      - Static checks self-hosted / build-checks (s390x) / check (runtime-rs, make check)
-      - Static checks self-hosted / build-checks (s390x) / check (runtime-rs, make test)
-      - Static checks self-hosted / build-checks (s390x) / check (runtime-rs, make vendor)
-      - Static checks self-hosted / build-checks (s390x) / check (runtime-rs, sudo -E PATH="$PATH" make test)
-      - Static checks self-hosted / build-checks (s390x) / check (runtime, make check)
-      - Static checks self-hosted / build-checks (s390x) / check (runtime, make test)
-      - Static checks self-hosted / build-checks (s390x) / check (runtime, make vendor)
-      - Static checks self-hosted / build-checks (s390x) / check (runtime, sudo -E PATH="$PATH" make test)
-      - Static checks self-hosted / build-checks (s390x) / check (trace-forwarder, make check)
-      - Static checks self-hosted / build-checks (s390x) / check (trace-forwarder, make test)
-      - Static checks self-hosted / build-checks (s390x) / check (trace-forwarder, make vendor)
-      - Static checks self-hosted / build-checks (s390x) / check (trace-forwarder, sudo -E PATH="$PATH" make test)
+      - Static checks self-hosted / build-checks (s390x) / check (make check, agent-ctl, src/tools/agent-ctl, rust, protobuf-compiler, clang)
+      - Static checks self-hosted / build-checks (s390x) / check (make check, agent, src/agent, rust, libdevmapper, libseccomp, protobuf-compiler, clang)
+      - Static checks self-hosted / build-checks (s390x) / check (make check, dragonball, src/dragonball, rust)
+      - Static checks self-hosted / build-checks (s390x) / check (make check, genpolicy, src/tools/genpolicy, rust, protobuf-compiler)
+      - Static checks self-hosted / build-checks (s390x) / check (make check, kata-ctl, src/tools/kata-ctl, rust)
+      - Static checks self-hosted / build-checks (s390x) / check (make check, runtime-rs, src/runtime-rs, rust)
+      - Static checks self-hosted / build-checks (s390x) / check (make check, runtime, src/runtime, golang, XDG_RUNTIME_DIR)
+      - Static checks self-hosted / build-checks (s390x) / check (make check, trace-forwarder, src/tools/trace-forwarder, rust)
+      - Static checks self-hosted / build-checks (s390x) / check (make test, agent-ctl, src/tools/agent-ctl, rust, protobuf-compiler, clang)
+      - Static checks self-hosted / build-checks (s390x) / check (make test, agent, src/agent, rust, libdevmapper, libseccomp, protobuf-compiler, clang)
+      - Static checks self-hosted / build-checks (s390x) / check (make test, dragonball, src/dragonball, rust)
+      - Static checks self-hosted / build-checks (s390x) / check (make test, genpolicy, src/tools/genpolicy, rust, protobuf-compiler)
+      - Static checks self-hosted / build-checks (s390x) / check (make test, kata-ctl, src/tools/kata-ctl, rust)
+      - Static checks self-hosted / build-checks (s390x) / check (make test, runtime-rs, src/runtime-rs, rust)
+      - Static checks self-hosted / build-checks (s390x) / check (make test, runtime, src/runtime, golang, XDG_RUNTIME_DIR)
+      - Static checks self-hosted / build-checks (s390x) / check (make test, trace-forwarder, src/tools/trace-forwarder, rust)
+      - Static checks self-hosted / build-checks (s390x) / check (make vendor, agent-ctl, src/tools/agent-ctl, rust, protobuf-compiler, clang)
+      - Static checks self-hosted / build-checks (s390x) / check (make vendor, agent, src/agent, rust, libdevmapper, libseccomp, protobuf-compiler, clang)
+      - Static checks self-hosted / build-checks (s390x) / check (make vendor, dragonball, src/dragonball, rust)
+      - Static checks self-hosted / build-checks (s390x) / check (make vendor, genpolicy, src/tools/genpolicy, rust, protobuf-compiler)
+      - Static checks self-hosted / build-checks (s390x) / check (make vendor, kata-ctl, src/tools/kata-ctl, rust)
+      - Static checks self-hosted / build-checks (s390x) / check (make vendor, runtime-rs, src/runtime-rs, rust)
+      - Static checks self-hosted / build-checks (s390x) / check (make vendor, runtime, src/runtime, golang, XDG_RUNTIME_DIR)
+      - Static checks self-hosted / build-checks (s390x) / check (make vendor, trace-forwarder, src/tools/trace-forwarder, rust)
+      - Static checks self-hosted / build-checks (s390x) / check (sudo -E PATH="$PATH" make test, agent-ctl, src/tools/agent-ctl, rust, protobuf-compiler, clang)
+      - Static checks self-hosted / build-checks (s390x) / check (sudo -E PATH="$PATH" make test, dragonball, src/dragonball, rust)
+      - Static checks self-hosted / build-checks (s390x) / check (sudo -E PATH="$PATH" make test, genpolicy, src/tools/genpolicy, rust, protobuf-compiler)
+      - Static checks self-hosted / build-checks (s390x) / check (sudo -E PATH="$PATH" make test, kata-ctl, src/tools/kata-ctl, rust)
+      - Static checks self-hosted / build-checks (s390x) / check (sudo -E PATH="$PATH" make test, runtime-rs, src/runtime-rs, rust)
+      - Static checks self-hosted / build-checks (s390x) / check (sudo -E PATH="$PATH" make test, runtime, src/runtime, golang, XDG_RUNTIME_DIR)
+      - Static checks self-hosted / build-checks (s390x) / check (sudo -E PATH="$PATH" make test, trace-forwarder, src/tools/trace-forwarder, rust)
     required-labels:
       - ok-to-test