diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index 52cb22fa..ccfd0b06 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -12,6 +12,15 @@ concurrency:
   cancel-in-progress: true
 
 env:
+  # target: _common
+  # field: output
+  # modifier: += (append)
+  # value = type=registry
+  # take a look at the docs for further info on how to append targets etc.
+  # append to target: https://docs.docker.com/reference/cli/docker/buildx/bake/#set
+  # GitHub Actions syntax: https://github.com/marketplace/actions/docker-buildx-bake
+  DOCKER_BAKE_REGISTRY_PUSH: _common.output+=type=registry,oci-artifact=true,oci-mediatypes=true
+
   GCS_BUCKET: images.metal-pod.io
   ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 
@@ -110,15 +119,7 @@ jobs:
           files: ./docker-bake.hcl
           targets: ${{ matrix.os.name }}
           no-cache: true
-
-          # target: _common
-          # field: output
-          # modifier: += (append)
-          # value = type=registry
-          # take a look at the docs for further info on how to append targets etc.
-          # append to target: https://docs.docker.com/reference/cli/docker/buildx/bake/#set
-          # GitHub Actions syntax: https://github.com/marketplace/actions/docker-buildx-bake
-          set: _common.output+=type=registry
+          set: ${{ env.DOCKER_BAKE_REGISTRY_PUSH }}
         env:
           OS_NAME: ${{ matrix.os.name }}
           SEMVER_MAJOR_MINOR: ${{ matrix.os.version }}
@@ -149,7 +150,7 @@ jobs:
           files: ./docker-bake.hcl
           targets: ubuntu-firewall
           no-cache: true
-          set: _common.output+=type=registry
+          set: ${{ env.DOCKER_BAKE_REGISTRY_PUSH }}
         env:
           OS_NAME: firewall
           SEMVER_MAJOR_MINOR: 3.0-ubuntu
@@ -183,7 +184,7 @@ jobs:
           files: ./docker-bake.hcl
           targets: ubuntu-capms
           no-cache: true
-          set: _common.output+=type=registry
+          set: ${{ env.DOCKER_BAKE_REGISTRY_PUSH }}
         env:
           KUBE_VERSION: 1.32.9
           KUBE_APT_BRANCH: v1.32
@@ -217,7 +218,7 @@ jobs:
           files: ./docker-bake.hcl
           targets: debian-nvidia
           no-cache: true
-          set: _common.output+=type=registry
+          set: ${{ env.DOCKER_BAKE_REGISTRY_PUSH }}
         env:
           OS_NAME: debian-nvidia
           SEMVER_MAJOR_MINOR: ${{ matrix.os.version }}
@@ -300,7 +301,7 @@ jobs:
           files: ./docker-bake.hcl
           targets: almalinux
           no-cache: true
-          set: _common.output+=type=registry
+          set: ${{ env.DOCKER_BAKE_REGISTRY_PUSH }}
         env:
           OS_NAME: almalinux
           SEMVER_MAJOR_MINOR: 9