diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 88952bb973..8ff824328b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -110,7 +110,7 @@ jobs:
         name: Build
         uses: docker/bake-action@v2
         with:
-          targets: binary
+          targets: all
           set: |
             *.platform=${{ matrix.platform }}
       -
diff --git a/Dockerfile b/Dockerfile
index 1d0a42b149..d21fe8cf9e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -597,6 +597,17 @@ EOT
 FROM scratch AS binary
 COPY --from=build /build/ /
 
+# usage:
+# > docker buildx bake all
+FROM scratch AS all
+COPY --from=tini          /build/ /
+COPY --from=runc          /build/ /
+COPY --from=containerd    /build/ /
+COPY --from=rootlesskit   /build/ /
+COPY --from=containerutil /build/ /
+COPY --from=vpnkit        /       /
+COPY --from=build         /build  /
+
 # usage:
 # > make shell
 # > SYSTEMD=true make shell
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 98e02cca98..95c1c6bcff 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -124,6 +124,20 @@ target "binary-cross" {
   inherits = ["binary", "_platforms"]
 }
 
+#
+# same as binary but with extra tools as well (containerd, runc, ...)
+#
+
+target "all" {
+  inherits = ["_common"]
+  target = "all"
+  output = [bindir(DOCKER_STATIC == "1" ? "binary" : "dynbinary")]
+}
+
+target "all-cross" {
+  inherits = ["all", "_platforms"]
+}
+
 #
 # dev
 #