diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 83168db9..7203fc50 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -260,6 +260,7 @@ jobs:
           {"cargo_profile": "release", "rust_toolchain": "nightly"},
           {"rust_target": "aarch64-unknown-linux-gnu", "feat_set": "default"},
           {"rust_target": "aarch64-unknown-linux-gnu", "feat_set": "logging"},
+          {"rust_target": "aarch64-unknown-linux-gnu", "bake_target": "nix"},
           {"rust_target": "aarch64-unknown-linux-gnu", "sys_target": "x86_64-v1-linux-gnu"},
           {"rust_target": "aarch64-unknown-linux-gnu", "sys_target": "x86_64-v2-linux-gnu"},
           {"rust_target": "aarch64-unknown-linux-gnu", "sys_target": "x86_64-v3-linux-gnu"},
@@ -270,12 +271,15 @@ jobs:
           {"sys_target": "x86_64-v2-linux-gnu", "machine": "ARM64"},
           {"sys_target": "x86_64-v2-linux-gnu", "feat_set": "default"},
           {"sys_target": "x86_64-v2-linux-gnu", "feat_set": "logging"},
+          {"sys_target": "x86_64-v2-linux-gnu", "bake_target": "nix"},
           {"sys_target": "x86_64-v3-linux-gnu", "machine": "ARM64"},
           {"sys_target": "x86_64-v3-linux-gnu", "feat_set": "default"},
           {"sys_target": "x86_64-v3-linux-gnu", "feat_set": "logging"},
+          {"sys_target": "x86_64-v3-linux-gnu", "bake_target": "nix"},
           {"sys_target": "x86_64-v4-linux-gnu", "machine": "ARM64"},
           {"sys_target": "x86_64-v4-linux-gnu", "feat_set": "default"},
           {"sys_target": "x86_64-v4-linux-gnu", "feat_set": "logging"},
+          {"sys_target": "x86_64-v4-linux-gnu", "bake_target": "nix"},
         ]
 
   publish:
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index e60bbdab..a7eba28d 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -182,9 +182,9 @@ jobs:
           },
           "nix": {
             "dst": "tuwunel.drv.tar.zst",
-            "src": "/opt/tuwunel/tuwunel.drv"
+            "src": "/opt/tuwunel/tuwunel.drv",
             "mime": "application/zstd",
-            "zstd": 6,
+            "zstd": 6
           }
         }
 
diff --git a/docker/bake.hcl b/docker/bake.hcl
index c8b8208b..6c0c1d83 100644
--- a/docker/bake.hcl
+++ b/docker/bake.hcl
@@ -953,13 +953,13 @@ target "build-deb" {
 }
 
 target "nix" {
-    name = elem("nix", [sys_name, sys_version, sys_target])
+    name = elem("nix", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target])
     tags = [
-        elem_tag("nix", [sys_name, sys_version, sys_target], "latest"),
+        elem_tag("nix", [cargo_profile, rust_toolchain, rust_target, feat_set, sys_name, sys_version, sys_target], "latest"),
     ]
     output = ["type=docker,compression=zstd,mode=min,compression-level=${zstd_image_compress_level}"]
     target = "nix-pkg"
-    matrix = sys
+    matrix = cargo_rust_feat_sys
     inherits = [
         elem("build-nix", [sys_name, sys_version, sys_target]),
     ]