diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index f2c52ad0..7029dccf 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -43,7 +43,7 @@ jobs:
       && contains(fromJSON(inputs.cargo_profiles), fromJSON('["test"]')[0])
       && contains(fromJSON(inputs.feat_sets), fromJSON('["all"]')[0])
       && contains(fromJSON(inputs.rust_toolchains), fromJSON('["nightly"]')[0])
-      && contains(fromJSON(inputs.machines), fromJSON('["X64"]')[0])
+      && contains(fromJSON(inputs.sys_targets), fromJSON('["x86_64-v1-linux-gnu"]')[0])
 
     name: Format
     uses: ./.github/workflows/bake.yml
@@ -54,9 +54,9 @@ jobs:
       rust_toolchains: '["nightly"]'
       rust_targets: ${{inputs.rust_targets}}
       sys_names: ${{inputs.sys_names}}
-      sys_targets: ${{inputs.sys_targets}}
       sys_versions: ${{inputs.sys_versions}}
-      machines: '["X64"]'
+      sys_targets: '["x86_64-v1-linux-gnu"]'
+      machines: ${{inputs.machines}}
       excludes: ${{inputs.excludes}}
       includes: ${{inputs.includes}}
 
@@ -66,7 +66,7 @@ jobs:
       && contains(fromJSON(inputs.cargo_profiles), fromJSON('["test"]')[0])
       && contains(fromJSON(inputs.feat_sets), fromJSON('["all"]')[0])
       && contains(fromJSON(inputs.rust_toolchains), fromJSON('["nightly"]')[0])
-      && contains(fromJSON(inputs.machines), fromJSON('["X64"]')[0])
+      && contains(fromJSON(inputs.sys_targets), fromJSON('["x86_64-v1-linux-gnu"]')[0])
 
     name: Typos
     uses: ./.github/workflows/bake.yml
@@ -78,8 +78,8 @@ jobs:
       sys_names: ${{inputs.sys_names}}
       sys_versions: ${{inputs.sys_versions}}
       rust_targets: ${{inputs.rust_targets}}
-      sys_targets: ${{inputs.sys_targets}}
-      machines: '["X64"]'
+      sys_targets: '["x86_64-v1-linux-gnu"]'
+      machines: ${{inputs.machines}}
       excludes: ${{inputs.excludes}}
       includes: ${{inputs.includes}}
 
@@ -89,7 +89,7 @@ jobs:
       && contains(fromJSON(inputs.cargo_profiles), fromJSON('["test"]')[0])
       && contains(fromJSON(inputs.feat_sets), fromJSON('["all"]')[0])
       && contains(fromJSON(inputs.rust_toolchains), fromJSON('["nightly"]')[0])
-      && contains(fromJSON(inputs.machines), fromJSON('["X64"]')[0])
+      && contains(fromJSON(inputs.sys_targets), fromJSON('["x86_64-v1-linux-gnu"]')[0])
 
     name: Audit
     uses: ./.github/workflows/bake.yml
@@ -101,8 +101,8 @@ jobs:
       sys_names: ${{inputs.sys_names}}
       sys_versions: ${{inputs.sys_versions}}
       rust_targets: ${{inputs.rust_targets}}
-      sys_targets: ${{inputs.sys_targets}}
-      machines: '["X64"]'
+      sys_targets: '["x86_64-v1-linux-gnu"]'
+      machines: ${{inputs.machines}}
       excludes: ${{inputs.excludes}}
       includes: ${{inputs.includes}}
 
@@ -112,7 +112,7 @@ jobs:
       && contains(fromJSON(inputs.cargo_profiles), fromJSON('["test"]')[0])
       && contains(fromJSON(inputs.feat_sets), fromJSON('["all"]')[0])
       && contains(fromJSON(inputs.rust_toolchains), fromJSON('["nightly"]')[0])
-      && contains(fromJSON(inputs.machines), fromJSON('["X64"]')[0])
+      && contains(fromJSON(inputs.sys_targets), fromJSON('["x86_64-v1-linux-gnu"]')[0])
 
     name: Lychee
     uses: ./.github/workflows/bake.yml
@@ -124,8 +124,8 @@ jobs:
       sys_names: ${{inputs.sys_names}}
       sys_versions: ${{inputs.sys_versions}}
       rust_targets: ${{inputs.rust_targets}}
-      sys_targets: ${{inputs.sys_targets}}
-      machines: '["X64"]'
+      sys_targets: '["x86_64-v1-linux-gnu"]'
+      machines: ${{inputs.machines}}
       excludes: ${{inputs.excludes}}
       includes: ${{inputs.includes}}
 
@@ -135,7 +135,7 @@ jobs:
       && contains(fromJSON(inputs.cargo_profiles), fromJSON('["test"]')[0])
       && contains(fromJSON(inputs.feat_sets), fromJSON('["all"]')[0])
       && contains(fromJSON(inputs.rust_toolchains), fromJSON('["nightly"]')[0])
-      && contains(fromJSON(inputs.machines), fromJSON('["X64"]')[0])
+      && contains(fromJSON(inputs.sys_targets), fromJSON('["x86_64-v1-linux-gnu"]')[0])
 
     name: Check
     uses: ./.github/workflows/bake.yml
@@ -147,8 +147,8 @@ jobs:
       sys_names: ${{inputs.sys_names}}
       sys_versions: ${{inputs.sys_versions}}
       rust_targets: ${{inputs.rust_targets}}
-      sys_targets: ${{inputs.sys_targets}}
-      machines: '["X64"]'
+      sys_targets: '["x86_64-v1-linux-gnu"]'
+      machines: ${{inputs.machines}}
       excludes: ${{inputs.excludes}}
       includes: ${{inputs.includes}}
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fdaf9084..31d8fbcb 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,7 +26,7 @@ jobs:
       default_sys_names: '["debian"]'
       default_sys_versions: '["testing-slim"]'
       default_rust_targets: '["x86_64-unknown-linux-gnu"]'
-      default_sys_targets: '["x86_64-linux-gnu"]'
+      default_sys_targets: '["x86_64-v1-linux-gnu"]'
       default_machines: '["X64"]'
 
     outputs:
@@ -55,8 +55,8 @@ jobs:
     - name: Initialize Builder
       env:
         runner: ${{matrix.runner}}
-        reserved_space: '{"het": "256GB", "aws": "48GB", "gcp": "160GB"}'
-        max_used_space: '{"het": "448GB", "aws": "64GB", "gcp": "192GB"}'
+        reserved_space: '{"het": "384GB", "aws": "48GB", "gcp": "160GB"}'
+        max_used_space: '{"het": "512GB", "aws": "64GB", "gcp": "192GB"}'
       run: |
         set +e
         docker buildx inspect "${GITHUB_ACTOR}"
@@ -138,10 +138,16 @@ jobs:
           {"rust_target": "aarch64-unknown-linux-gnu", "feat_set": "none"},
           {"rust_target": "aarch64-unknown-linux-gnu", "feat_set": "default"},
           {"rust_target": "aarch64-unknown-linux-gnu", "rust_toolchain": "nightly"},
-          {"rust_target": "aarch64-unknown-linux-gnu", "sys_target": "x86_64-linux-gnu"},
-          {"rust_target": "x86_64-unknown-linux-gnu", "sys_target": "aarch64-linux-gnu"},
-          {"sys_target": "x86_64-linux-gnu", "machine": "ARM64"},
-          {"sys_target": "aarch64-linux-gnu", "machine": "X64"},
+          {"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"},
+          {"rust_target": "aarch64-unknown-linux-gnu", "sys_target": "x86_64-v4-linux-gnu"},
+          {"rust_target": "x86_64-unknown-linux-gnu", "sys_target": "aarch64-v8-linux-gnu"},
+          {"sys_target": "aarch64-v8-linux-gnu", "machine": "X64"},
+          {"sys_target": "x86_64-v1-linux-gnu", "machine": "ARM64"},
+          {"sys_target": "x86_64-v2-linux-gnu"},
+          {"sys_target": "x86_64-v3-linux-gnu"},
+          {"sys_target": "x86_64-v4-linux-gnu"},
         ]
 
   test:
@@ -175,10 +181,22 @@ jobs:
           {"rust_target": "aarch64-unknown-linux-gnu", "feat_set": "none"},
           {"rust_target": "aarch64-unknown-linux-gnu", "feat_set": "default"},
           {"rust_target": "aarch64-unknown-linux-gnu", "rust_toolchain": "nightly"},
-          {"rust_target": "aarch64-unknown-linux-gnu", "sys_target": "x86_64-linux-gnu"},
-          {"rust_target": "x86_64-unknown-linux-gnu", "sys_target": "aarch64-linux-gnu"},
-          {"sys_target": "x86_64-linux-gnu", "machine": "ARM64"},
-          {"sys_target": "aarch64-linux-gnu", "machine": "X64"},
+          {"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"},
+          {"rust_target": "aarch64-unknown-linux-gnu", "sys_target": "x86_64-v4-linux-gnu"},
+          {"rust_target": "x86_64-unknown-linux-gnu", "sys_target": "aarch64-v8-linux-gnu"},
+          {"sys_target": "aarch64-v8-linux-gnu", "machine": "X64"},
+          {"sys_target": "x86_64-v1-linux-gnu", "machine": "ARM64"},
+          {"sys_target": "x86_64-v2-linux-gnu", "machine": "ARM64"},
+          {"sys_target": "x86_64-v2-linux-gnu", "feat_set": "none"},
+          {"sys_target": "x86_64-v2-linux-gnu", "feat_set": "default"},
+          {"sys_target": "x86_64-v3-linux-gnu", "machine": "ARM64"},
+          {"sys_target": "x86_64-v3-linux-gnu", "feat_set": "none"},
+          {"sys_target": "x86_64-v3-linux-gnu", "feat_set": "default"},
+          {"sys_target": "x86_64-v4-linux-gnu", "machine": "ARM64"},
+          {"sys_target": "x86_64-v4-linux-gnu", "feat_set": "none"},
+          {"sys_target": "x86_64-v4-linux-gnu", "feat_set": "default"},
         ]
 
   package:
@@ -203,22 +221,29 @@ jobs:
         [
           {"feat_set": "none"},
           {"cargo_profile": "test"},
+          {"cargo_profile": "release-native"},
           {"cargo_profile": "release-debuginfo", "feat_set": "default"},
           {"cargo_profile": "release-debuginfo", "rust_toolchain": "nightly"},
           {"cargo_profile": "release-debuginfo", "bake_target": "oci"},
           {"cargo_profile": "release-debuginfo", "rust_target": "aarch64-unknown-linux-gnu"},
-          {"cargo_profile": "release-native", "feat_set": "default"},
-          {"cargo_profile": "release-native", "rust_toolchain": "stable"},
-          {"cargo_profile": "release-native", "feat_set": "default"},
-          {"cargo_profile": "release-native", "bake_target": "docker"},
-          {"cargo_profile": "release-native", "bake_target": "oci"},
-          {"cargo_profile": "release-native", "rust_target": "aarch64-unknown-linux-gnu"},
+          {"cargo_profile": "release-debuginfo", "sys_target": "x86_64-v2-linux-gnu"},
+          {"cargo_profile": "release-debuginfo", "sys_target": "x86_64-v3-linux-gnu"},
+          {"cargo_profile": "release-debuginfo", "sys_target": "x86_64-v4-linux-gnu"},
           {"cargo_profile": "release", "rust_toolchain": "nightly"},
           {"rust_target": "aarch64-unknown-linux-gnu", "feat_set": "default"},
-          {"rust_target": "aarch64-unknown-linux-gnu", "sys_target": "x86_64-linux-gnu"},
-          {"rust_target": "x86_64-unknown-linux-gnu", "sys_target": "aarch64-linux-gnu"},
-          {"sys_target": "x86_64-linux-gnu", "machine": "ARM64"},
-          {"sys_target": "aarch64-linux-gnu", "machine": "X64"},
+          {"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"},
+          {"rust_target": "aarch64-unknown-linux-gnu", "sys_target": "x86_64-v4-linux-gnu"},
+          {"rust_target": "x86_64-unknown-linux-gnu", "sys_target": "aarch64-v8-linux-gnu"},
+          {"sys_target": "aarch64-v8-linux-gnu", "machine": "X64"},
+          {"sys_target": "x86_64-v1-linux-gnu", "machine": "ARM64"},
+          {"sys_target": "x86_64-v2-linux-gnu", "machine": "ARM64"},
+          {"sys_target": "x86_64-v2-linux-gnu", "feat_set": "default"},
+          {"sys_target": "x86_64-v3-linux-gnu", "machine": "ARM64"},
+          {"sys_target": "x86_64-v3-linux-gnu", "feat_set": "default"},
+          {"sys_target": "x86_64-v4-linux-gnu", "machine": "ARM64"},
+          {"sys_target": "x86_64-v4-linux-gnu", "feat_set": "default"},
         ]
 
   publish:
@@ -247,10 +272,19 @@ jobs:
           {"cargo_profile": "release-native"},
           {"cargo_profile": "release", "rust_toolchain": "nightly"},
           {"rust_target": "aarch64-unknown-linux-gnu", "feat_set": "default"},
-          {"rust_target": "aarch64-unknown-linux-gnu", "sys_target": "x86_64-linux-gnu"},
-          {"rust_target": "x86_64-unknown-linux-gnu", "sys_target": "aarch64-linux-gnu"},
-          {"sys_target": "x86_64-linux-gnu", "machine": "ARM64"},
-          {"sys_target": "aarch64-linux-gnu", "machine": "X64"},
+          {"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"},
+          {"rust_target": "aarch64-unknown-linux-gnu", "sys_target": "x86_64-v4-linux-gnu"},
+          {"rust_target": "x86_64-unknown-linux-gnu", "sys_target": "aarch64-v8-linux-gnu"},
+          {"sys_target": "aarch64-v8-linux-gnu", "machine": "X64"},
+          {"sys_target": "x86_64-v1-linux-gnu", "machine": "ARM64"},
+          {"sys_target": "x86_64-v2-linux-gnu", "machine": "ARM64"},
+          {"sys_target": "x86_64-v2-linux-gnu", "feat_set": "default"},
+          {"sys_target": "x86_64-v3-linux-gnu", "machine": "ARM64"},
+          {"sys_target": "x86_64-v3-linux-gnu", "feat_set": "default"},
+          {"sys_target": "x86_64-v4-linux-gnu", "machine": "ARM64"},
+          {"sys_target": "x86_64-v4-linux-gnu", "feat_set": "default"},
         ]
 
     secrets:
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index cb0e3f4e..bff0c1ba 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -49,7 +49,7 @@ jobs:
       && contains(fromJSON(inputs.cargo_profiles), fromJSON('["release"]')[0])
       && contains(fromJSON(inputs.feat_sets), fromJSON('["default"]')[0])
       && contains(fromJSON(inputs.rust_toolchains), fromJSON('["stable"]')[0])
-      && contains(fromJSON(inputs.machines), fromJSON('["X64"]')[0])
+      && contains(fromJSON(inputs.sys_targets), fromJSON('["x86_64-v1-linux-gnu"]')[0])
 
     name: Book
     uses: ./.github/workflows/bake.yml
@@ -60,9 +60,9 @@ jobs:
       rust_toolchains: '["stable"]'
       rust_targets: ${{inputs.rust_targets}}
       sys_names: ${{inputs.sys_names}}
-      sys_targets: ${{inputs.sys_targets}}
       sys_versions: ${{inputs.sys_versions}}
-      machines: '["X64"]'
+      sys_targets: '["x86_64-v1-linux-gnu"]'
+      machines: ${{inputs.machines}}
       runner: 'het'
       excludes: ${{inputs.excludes}}
       includes: ${{inputs.includes}}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index c16bc247..d9a61a1d 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -49,7 +49,7 @@ jobs:
   documents:
     if: >
       !failure() && !cancelled()
-      && contains(fromJSON(inputs.machines), fromJSON('["X64"]')[0])
+      && contains(fromJSON(inputs.sys_targets), fromJSON('["X64"]')[0])
       && (github.ref == 'refs/heads/main' || contains(github.ref, 'refs/tags/v'))
       && !contains(github.ref, '-draft')
 
@@ -70,7 +70,6 @@ jobs:
       && inputs.machines
       && inputs.docker_repo != ''
       && (github.ref == 'refs/heads/main' || contains(github.ref, 'refs/tags/v'))
-      && !contains(github.ref, '-draft')
 
     name: Containers
     runs-on: ${{matrix.machine}}
@@ -135,8 +134,7 @@ jobs:
       && contains(fromJSON(inputs.cargo_profiles), fromJSON('["release"]')[0])
       && contains(fromJSON(inputs.feat_sets), fromJSON('["all"]')[0])
       && contains(fromJSON(inputs.rust_toolchains), fromJSON('["stable"]')[0])
-      && contains(github.ref, 'refs/tags/v')
-      && !contains(github.ref, '-draft')
+      && (github.ref == 'refs/heads/main' || contains(github.ref, 'refs/tags/v'))
 
     name: Bundles
     needs: [containers]
@@ -172,9 +170,36 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.dockerhub_token }}
 
+      - name: Release Branch
+        if: >
+          !failure() && !cancelled()
+          && github.ref == 'refs/heads/main'
+
+        env:
+          acct: ${{github.actor}}
+          ghcr_repo: ${{github.repository}}
+          docker_repo: ${{inputs.docker_repo}}
+          registry: ${{matrix.bake_target}}
+          cargo_profile: ${{matrix.cargo_profile}}
+          feat_set: ${{matrix.feat_set}}
+          sys_target: ${{matrix.sys_target}}
+          ref_name: ${{github.ref_name}}
+
+        run: |
+          registry="$(echo -n $registry | sed s/_/./)"
+          if test "$registry" = "ghcr.io"; then
+            repo="$ghcr_repo"
+          else
+            repo="$docker_repo"
+          fi
+
+          docker manifest create "${registry}/${repo}:${ref_name}" \
+            --amend "${registry}/${repo}:${ref_name}-${cargo_profile}-${feat_set}-${sys_target}"
+
       - name: Release Preview
         if: >
           !failure() && !cancelled()
+          && contains(github.ref, 'refs/tags/v')
           && !contains(github.ref, '-draft')
 
         env:
@@ -201,6 +226,7 @@ jobs:
       - name: Release Latest
         if: >
           !failure() && !cancelled()
+          && contains(github.ref, 'refs/tags/v')
           && !contains(github.ref, '-draft')
           && !contains(github.ref, '-rc')
 
@@ -230,7 +256,7 @@ jobs:
       !failure() && !cancelled()
       && inputs.machines
       && inputs.docker_repo != ''
-      && contains(github.ref, 'refs/tags/v')
+      && (github.ref == 'refs/heads/main' || contains(github.ref, 'refs/tags/v'))
 
     name: Delivery
     needs: [bundles, documents]
@@ -251,9 +277,24 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.dockerhub_token }}
 
+      - name: Push Branch
+        if: >
+          !failure() && !cancelled()
+          && github.ref == 'refs/heads/main'
+
+        env:
+          ref_name: ${{github.ref_name}}
+          ghcr_repo: ${{github.repository}}
+          docker_repo: ${{inputs.docker_repo}}
+
+        run: |
+          docker manifest push -p "ghcr.io/${ghcr_repo}:${ref_name}"
+          docker manifest push -p "docker.io/${docker_repo}:${ref_name}"
+
       - name: Push Preview
         if: >
           !failure() && !cancelled()
+          && contains(github.ref, 'refs/tags/v')
           && !contains(github.ref, '-draft')
 
         env:
@@ -267,6 +308,7 @@ jobs:
       - name: Push Latest
         if: >
           !failure() && !cancelled()
+          && contains(github.ref, 'refs/tags/v')
           && !contains(github.ref, '-draft')
           && !contains(github.ref, '-rc')
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a76da669..4c2edf74 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -50,7 +50,7 @@ jobs:
       contains(fromJSON(inputs.cargo_profiles), fromJSON('["test"]')[0])
       && contains(fromJSON(inputs.feat_sets), fromJSON('["all"]')[0])
       && contains(fromJSON(inputs.rust_toolchains), fromJSON('["nightly"]')[0])
-      && contains(fromJSON(inputs.machines), fromJSON('["X64"]')[0])
+      && contains(fromJSON(inputs.sys_targets), fromJSON('["x86_64-v1-linux-gnu"]')[0])
 
     name: Unit
     uses: ./.github/workflows/bake.yml
@@ -62,8 +62,8 @@ jobs:
       sys_names: ${{inputs.sys_names}}
       sys_versions: ${{inputs.sys_versions}}
       rust_targets: ${{inputs.rust_targets}}
-      sys_targets: ${{inputs.sys_targets}}
-      machines: '["X64"]'
+      sys_targets: '["x86_64-v1-linux-gnu"]'
+      machines: ${{inputs.machines}}
       excludes: ${{inputs.excludes}}
       includes: ${{inputs.includes}}
 
@@ -92,6 +92,7 @@ jobs:
           {"cargo_profile": "test", "feat_set": "none", "bake_target": "smoke-valgrind"},
           {"cargo_profile": "test", "rust_toolchain": "stable"},
           {"cargo_profile": "test", "rust_target": "aarch64-unknown-linux-gnu"},
+          {"cargo_profile": "test", "sys_target": "x86_64-v2-linux-gnu", "bake_target": "smoke-valgrind"},
           {"cargo_profile": "release", "rust_toolchain": "nightly"},
           {"cargo_profile": "release", "rust_toolchain": "stable", "feat_set": "none"},
           {"cargo_profile": "release", "bake_target": "smoke-valgrind"},
@@ -104,12 +105,29 @@ jobs:
           {"cargo_profile": "release-native", "feat_set": "default"},
           {"cargo_profile": "release-native", "bake_target": "smoke-valgrind"},
           {"cargo_profile": "release-native", "rust_target": "aarch64-unknown-linux-gnu"},
+          {"cargo_profile": "release-native", "sys_target": "x86_64-v2-linux-gnu"},
+          {"cargo_profile": "release-native", "sys_target": "x86_64-v3-linux-gnu"},
+          {"cargo_profile": "release-native", "sys_target": "x86_64-v4-linux-gnu"},
           {"rust_target": "aarch64-unknown-linux-gnu", "feat_set": "none"},
           {"rust_target": "aarch64-unknown-linux-gnu", "feat_set": "default"},
-          {"rust_target": "aarch64-unknown-linux-gnu", "sys_target": "x86_64-linux-gnu"},
-          {"rust_target": "x86_64-unknown-linux-gnu", "sys_target": "aarch64-linux-gnu"},
-          {"sys_target": "x86_64-linux-gnu", "machine": "ARM64"},
-          {"sys_target": "aarch64-linux-gnu", "machine": "X64"},
+          {"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"},
+          {"rust_target": "aarch64-unknown-linux-gnu", "sys_target": "x86_64-v4-linux-gnu"},
+          {"rust_target": "x86_64-unknown-linux-gnu", "sys_target": "aarch64-v8-linux-gnu"},
+          {"sys_target": "aarch64-v8-linux-gnu", "machine": "X64"},
+          {"sys_target": "x86_64-v1-linux-gnu", "machine": "ARM64"},
+          {"sys_target": "x86_64-v2-linux-gnu", "machine": "ARM64"},
+          {"sys_target": "x86_64-v2-linux-gnu", "feat_set": "none"},
+          {"sys_target": "x86_64-v2-linux-gnu", "feat_set": "default"},
+          {"sys_target": "x86_64-v3-linux-gnu", "machine": "ARM64"},
+          {"sys_target": "x86_64-v3-linux-gnu", "feat_set": "none"},
+          {"sys_target": "x86_64-v3-linux-gnu", "feat_set": "default"},
+          {"sys_target": "x86_64-v3-linux-gnu", "bake_target": "smoke-valgrind"},
+          {"sys_target": "x86_64-v4-linux-gnu", "machine": "ARM64"},
+          {"sys_target": "x86_64-v4-linux-gnu", "feat_set": "none"},
+          {"sys_target": "x86_64-v4-linux-gnu", "feat_set": "default"},
+          {"sys_target": "x86_64-v4-linux-gnu", "bake_target": "smoke-valgrind"},
         ]
 
   complement:
@@ -119,7 +137,7 @@ jobs:
       && contains(fromJSON(inputs.cargo_profiles), fromJSON('["test"]')[0])
       && contains(fromJSON(inputs.complement_feat_sets), fromJSON('["all"]')[0])
       && contains(fromJSON(inputs.rust_toolchains), fromJSON('["nightly"]')[0])
-      && contains(fromJSON(inputs.machines), fromJSON('["X64"]')[0])
+      && contains(fromJSON(inputs.sys_targets), fromJSON('["x86_64-v1-linux-gnu"]')[0])
 
     name: Complement
     uses: ./.github/workflows/bake.yml
@@ -131,8 +149,8 @@ jobs:
       sys_names: ${{inputs.sys_names}}
       sys_versions: ${{inputs.sys_versions}}
       rust_targets: ${{inputs.rust_targets}}
-      sys_targets: ${{inputs.sys_targets}}
-      machines: '["X64"]'
+      sys_targets: '["x86_64-v1-linux-gnu"]'
+      machines: ${{inputs.machines}}
       runner: ${{inputs.complement_runner}}
       excludes: ${{inputs.excludes}}
       includes: ${{inputs.includes}}
@@ -145,7 +163,7 @@ jobs:
       && contains(fromJSON(inputs.cargo_profiles), fromJSON('["test"]')[0])
       && contains(fromJSON(inputs.feat_sets), fromJSON('["all"]')[0])
       && contains(fromJSON(inputs.rust_toolchains), fromJSON('["nightly"]')[0])
-      && contains(fromJSON(inputs.machines), fromJSON('["X64"]')[0])
+      && contains(fromJSON(inputs.sys_targets), fromJSON('["x86_64-v1-linux-gnu"]')[0])
 
     name: Matrix Compliance
     needs: [complement]
@@ -163,8 +181,8 @@ jobs:
         sys_name: ${{fromJSON(inputs.sys_names)}}
         sys_version: ${{fromJSON(inputs.sys_versions)}}
         rust_target: ${{fromJSON(inputs.rust_targets)}}
-        sys_target: ${{fromJSON(inputs.sys_targets)}}
-        machine: ${{fromJSON('["X64"]')}}
+        sys_target: ${{fromJSON('["x86_64-v1-linux-gnu"]')}}
+        machine: ${{fromJSON(inputs.machines)}}
         exclude: ${{fromJSON(inputs.excludes)}}
         include: ${{fromJSON(inputs.includes)}}
 
diff --git a/docker/Dockerfile.cargo b/docker/Dockerfile.cargo
index 1af8ead3..7678bd1a 100644
--- a/docker/Dockerfile.cargo
+++ b/docker/Dockerfile.cargo
@@ -1,7 +1,7 @@
 # syntax = docker/dockerfile:1.11-labs
 
 FROM input AS cargo
-ARG sys_target
+ARG sys_triple
 ARG rust_target
 ARG rust_toolchain
 ARG RUST_HOME
@@ -38,7 +38,7 @@ COPY --link --from=input . .
 COPY --link --from=rust ${RUST_HOME} ${RUST_HOME}
 COPY --link --from=deps /usr/src/tuwunel /usr/src/tuwunel
 
-WORKDIR /usr/lib/${sys_target}
+WORKDIR /usr/lib/${sys_triple}
 COPY --link --from=rocksdb . .
 
 WORKDIR /usr/src/tuwunel
diff --git a/docker/Dockerfile.cargo.audit b/docker/Dockerfile.cargo.audit
index 6f70f7fd..fbc224ec 100644
--- a/docker/Dockerfile.cargo.audit
+++ b/docker/Dockerfile.cargo.audit
@@ -1,7 +1,6 @@
 # syntax = docker/dockerfile:1.11-labs
 
 FROM input AS audit
-ARG sys_target
 ARG rust_toolchain="nightly"
 ARG RUSTUP_HOME
 ARG CARGO_HOME
diff --git a/docker/Dockerfile.cargo.deb b/docker/Dockerfile.cargo.deb
index a6007209..9d901d8f 100644
--- a/docker/Dockerfile.cargo.deb
+++ b/docker/Dockerfile.cargo.deb
@@ -1,7 +1,6 @@
 # syntax = docker/dockerfile:1.11-labs
 
 FROM input AS build-deb
-ARG sys_target
 ARG rust_target
 ARG rust_toolchain
 ARG RUSTUP_HOME
diff --git a/docker/Dockerfile.cargo.fmt b/docker/Dockerfile.cargo.fmt
index 24d5f215..c3606a70 100644
--- a/docker/Dockerfile.cargo.fmt
+++ b/docker/Dockerfile.cargo.fmt
@@ -1,7 +1,6 @@
 # syntax = docker/dockerfile:1.11-labs
 
 FROM input AS fmt
-ARG sys_target
 ARG rust_toolchain="nightly"
 ARG RUSTUP_HOME
 ARG CARGO_HOME
diff --git a/docker/Dockerfile.cargo.lychee b/docker/Dockerfile.cargo.lychee
index 85df47e2..216bfff3 100644
--- a/docker/Dockerfile.cargo.lychee
+++ b/docker/Dockerfile.cargo.lychee
@@ -1,7 +1,6 @@
 # syntax = docker/dockerfile:1.11-labs
 
 FROM input AS lychee
-ARG sys_target
 ARG rust_toolchain="nightly"
 ARG RUSTUP_HOME
 ARG CARGO_HOME
diff --git a/docker/Dockerfile.cargo.rpm b/docker/Dockerfile.cargo.rpm
index d4a85580..6b8a9be6 100644
--- a/docker/Dockerfile.cargo.rpm
+++ b/docker/Dockerfile.cargo.rpm
@@ -1,7 +1,6 @@
 # syntax = docker/dockerfile:1.11-labs
 
 FROM input AS build-rpm
-ARG sys_target
 ARG rust_toolchain
 ARG RUSTUP_HOME
 ARG CARGO_HOME
diff --git a/docker/Dockerfile.rocksdb b/docker/Dockerfile.rocksdb
index 28452c47..0c443c12 100644
--- a/docker/Dockerfile.rocksdb
+++ b/docker/Dockerfile.rocksdb
@@ -26,10 +26,10 @@ EOF
 
 FROM input AS rocksdb-build
 ARG rocksdb_shared=0
-ARG rocksdb_portable=1
+ARG rocksdb_portable="1"
 ARG rocksdb_opt_level="3"
 ARG rocksdb_build_type="Release"
-ARG rocksdb_cxx_flags="-ftls-model=initial-exec -mno-outline-atomics"
+ARG rocksdb_cxx_flags="-ftls-model=initial-exec"
 ARG rocksdb_make_verbose="ON"
 ARG rocksdb_make_rule_messages="OFF"
 ARG rocksdb_jemalloc=1
diff --git a/docker/Dockerfile.rust b/docker/Dockerfile.rust
index f69a4717..8dffe40a 100644
--- a/docker/Dockerfile.rust
+++ b/docker/Dockerfile.rust
@@ -16,7 +16,7 @@ RUN <<EOF
     var="${rustup_version}/${rust_target}"
     url="https://static.rust-lang.org/rustup/archive/$var/rustup-init"
     curl -S -O -s "$url"
-    chmod o+x rustup-init
+    chmod a+rx rustup-init
 EOF
 
 FROM input AS rust
@@ -54,7 +54,7 @@ RUN \
         --no-update-default-toolchain \
         --no-modify-path
 
-    chmod -R go+rw $CARGO_HOME $RUSTUP_HOME
+    chmod -R a+rw $CARGO_HOME $RUSTUP_HOME
     rm rustup-init
 
     rustup component add \
diff --git a/docker/Dockerfile.source b/docker/Dockerfile.source
index 1278fc3f..e2bcda4d 100644
--- a/docker/Dockerfile.source
+++ b/docker/Dockerfile.source
@@ -18,7 +18,6 @@ EOF
 
 
 FROM input AS ingredients
-ARG sys_target
 ARG rust_target
 ARG rust_toolchain
 ARG RUST_HOME
diff --git a/docker/bake.hcl b/docker/bake.hcl
index 10e96ae3..3e58f0db 100644
--- a/docker/bake.hcl
+++ b/docker/bake.hcl
@@ -16,9 +16,6 @@ variable "repo" {
 variable "docker_repo" {
     default = "${repo}"
 }
-variable "docker_targets" {
-	default = "[\"local\"]"
-}
 
 variable "git_ref" {
     default = "${GITHUB_REF}"
@@ -60,19 +57,19 @@ variable "rust_targets" {
     default = "[\"x86_64-unknown-linux-gnu\"]"
 }
 
-variable "sys_targets" {
-    default = "[\"x86_64-linux-gnu\"]"
+variable "sys_names" {
+    default = "[\"debian\"]"
 }
 variable "sys_versions" {
     default = "[\"testing-slim\"]"
 }
-variable "sys_names" {
-    default = "[\"debian\"]"
+variable "sys_targets" {
+    default = "[\"x86_64-v1-linux-gnu\"]"
 }
 
 # RocksDB options
 variable "rocksdb_portable" {
-    default = 1
+    default = "1"
 }
 variable "rocksdb_opt_level" {
     default = "3"
@@ -1203,7 +1200,7 @@ target "deps-base" {
                     join(" ", static_rustflags),
                     join(" ", static_nightly_rustflags),
                     join(" ", native_rustflags),
-                    "-C link-arg=-L/usr/lib/gcc/${sys_target}/14", #FIXME
+                    "-C link-arg=-L/usr/lib/gcc/${sys_target_triple(sys_target)}/14", #FIXME
                     contains(split(",", cargo_feat_sets[feat_set]), "bzip2_compression")?
                         "-C link-arg=-l:libbz2.a": "",
                     contains(split(",", cargo_feat_sets[feat_set]), "lz4_compression")?
@@ -1213,7 +1210,7 @@ target "deps-base" {
                     contains(split(",", cargo_feat_sets[feat_set]), "io_uring")?
                         "-C link-arg=-l:liburing.a": "",
                     join(" ", static_libs),
-                    sys_target == "aarch64-linux-gnu"?
+                    sys_target_triple(sys_target) == "aarch64-linux-gnu"?
                         "-C link-arg=-l:libgcc.a": "",
                 ]):
 
@@ -1223,7 +1220,9 @@ target "deps-base" {
                     join(" ", nightly_rustflags),
                     join(" ", static_rustflags),
                     join(" ", static_nightly_rustflags),
-                    "-C link-arg=-L/usr/lib/gcc/${sys_target}/14", #FIXME
+                    sys_target_triple(sys_target) == "x86_64-linux-gnu"?
+                        "-C target-cpu=${sys_target_isa(sys_target)}": "",
+                    "-C link-arg=-L/usr/lib/gcc/${sys_target_triple(sys_target)}/14", #FIXME
                     contains(split(",", cargo_feat_sets[feat_set]), "bzip2_compression")?
                         "-C link-arg=-l:libbz2.a": "",
                     contains(split(",", cargo_feat_sets[feat_set]), "lz4_compression")?
@@ -1233,7 +1232,7 @@ target "deps-base" {
                     contains(split(",", cargo_feat_sets[feat_set]), "io_uring")?
                         "-C link-arg=-l:liburing.a": "",
                     join(" ", static_libs),
-                    sys_target == "aarch64-linux-gnu"?
+                    sys_target_triple(sys_target) == "aarch64-linux-gnu"?
                         "-C link-arg=-l:libgcc.a": "",
                 ]):
 
@@ -1241,7 +1240,9 @@ target "deps-base" {
                 join(" ", [
                     join(" ", rustflags),
                     join(" ", static_rustflags),
-                    "-C link-arg=-L/usr/lib/gcc/${sys_target}/14", #FIXME
+                    sys_target_triple(sys_target) == "x86_64-linux-gnu"?
+                        "-C target-cpu=${sys_target_isa(sys_target)}": "",
+                    "-C link-arg=-L/usr/lib/gcc/${sys_target_triple(sys_target)}/14", #FIXME
                     contains(split(",", cargo_feat_sets[feat_set]), "bzip2_compression")?
                         "-C link-arg=-l:libbz2.a": "",
                     contains(split(",", cargo_feat_sets[feat_set]), "lz4_compression")?
@@ -1251,7 +1252,7 @@ target "deps-base" {
                     contains(split(",", cargo_feat_sets[feat_set]), "io_uring")?
                         "-C link-arg=-l:liburing.a": "",
                     join(" ", static_libs),
-                    sys_target == "aarch64-linux-gnu"?
+                    sys_target_triple(sys_target) == "aarch64-linux-gnu"?
                         "-C link-arg=-l:libgcc.a": "",
                 ]):
 
@@ -1259,7 +1260,9 @@ target "deps-base" {
                 join(" ", [
                     join(" ", rustflags),
                     join(" ", static_rustflags),
-                    "-C link-arg=-L/usr/lib/gcc/${sys_target}/14", #FIXME
+                    sys_target_triple(sys_target) == "x86_64-linux-gnu"?
+                        "-C target-cpu=${sys_target_isa(sys_target)}": "",
+                    "-C link-arg=-L/usr/lib/gcc/${sys_target_triple(sys_target)}/14", #FIXME
                     contains(split(",", cargo_feat_sets[feat_set]), "bzip2_compression")?
                         "-C link-arg=-l:libbz2.a": "",
                     contains(split(",", cargo_feat_sets[feat_set]), "lz4_compression")?
@@ -1269,7 +1272,7 @@ target "deps-base" {
                     contains(split(",", cargo_feat_sets[feat_set]), "io_uring")?
                         "-C link-arg=-l:liburing.a": "",
                     join(" ", static_libs),
-                    sys_target == "aarch64-linux-gnu"?
+                    sys_target_triple(sys_target) == "aarch64-linux-gnu"?
                         "-C link-arg=-l:libgcc.a": "",
                 ]):
 
@@ -1278,6 +1281,8 @@ target "deps-base" {
                     join(" ", rustflags),
                     join(" ", nightly_rustflags),
                     join(" ", dynamic_rustflags),
+                    sys_target_triple(sys_target) == "x86_64-linux-gnu"?
+                        "-C target-cpu=${sys_target_isa(sys_target)}": "",
                     contains(split(",", cargo_feat_sets[feat_set]), "bzip2_compression")?
                         "-C link-arg=-lbz2": "",
                     contains(split(",", cargo_feat_sets[feat_set]), "lz4_compression")?
@@ -1336,10 +1341,27 @@ target "rocksdb-build" {
         rocksdb_zstd = contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")? 1: 0
         rocksdb_jemalloc = contains(split(",", cargo_feat_sets[feat_set]), "jemalloc")? 1: 0
         rocksdb_iouring = contains(split(",", cargo_feat_sets[feat_set]), "io_uring")? 1: 0
-        rocksdb_portable = cargo_profile == "release_max_perf"? 0: rocksdb_portable
-        rocksdb_build_type = rocksdb_build_type
-        rocksdb_opt_level = rocksdb_opt_level
         rocksdb_shared = 0
+        rocksdb_opt_level = rocksdb_opt_level
+        rocksdb_build_type = rocksdb_build_type
+        rocksdb_cxx_flags = (
+            cargo_profile == "release-native" && sys_target_triple(sys_target) == "aarch64-linux-gnu"?
+                "-ftls-model=local-exec -mno-outline-atomics":
+            cargo_profile == "release-native"?
+                "-ftls-model=local-exec":
+            sys_target_triple(sys_target) == "aarch64-linux-gnu"?
+                "-ftls-model=initial-exec -mno-outline-atomics":
+            sys_target_triple(sys_target) == "x86_64-linux-gnu" && sys_target != "x86_64-v1-linux-gnu"?
+                "-ftls-model=initial-exec -mpclmul":
+                "-ftls-model=initial-exec"
+        )
+        rocksdb_portable = (
+            cargo_profile == "release-native"?
+                "0":
+            sys_target_triple(sys_target) == "x86_64-linux-gnu"?
+                "${sys_target_isa(sys_target)}":
+                rocksdb_portable
+        )
     }
 }
 
@@ -1435,8 +1457,8 @@ target "ingredients" {
                 "--all-features": "--no-default-features"
         )
         RUST_BACKTRACE = "full"
-        ROCKSDB_LIB_DIR="/usr/lib/${sys_target}"
-        JEMALLOC_OVERRIDE="/usr/lib/${sys_target}/libjemalloc.a"
+        ROCKSDB_LIB_DIR="/usr/lib/${sys_target_triple(sys_target)}"
+        JEMALLOC_OVERRIDE="/usr/lib/${sys_target_triple(sys_target)}/libjemalloc.a"
         ZSTD_SYS_USE_PKG_CONFIG = (
             contains(split(",", cargo_feat_sets[feat_set]), "zstd_compression")? 1: 0
         )
@@ -1517,8 +1539,8 @@ target "rust" {
         cargo_installs = join(" ", cargo_installs)
 
         CARGO_TERM_VERBOSE = CARGO_TERM_VERBOSE
-        RUSTUP_HOME = "/opt/rust/rustup/${sys_name}/${sys_target}"
-        CARGO_HOME = "/opt/rust/cargo/${sys_name}/${sys_target}"
+        RUSTUP_HOME = "/opt/rust/rustup/${sys_name}/${sys_target_triple(sys_target)}"
+        CARGO_HOME = "/opt/rust/cargo/${sys_name}/${sys_target_triple(sys_target)}"
     }
 }
 
@@ -1725,8 +1747,8 @@ target "base" {
     }
     args = {
         DEBIAN_FRONTEND="noninteractive"
-        var_lib_apt = "/var/lib/apt/${sys_name}/${sys_version}/${sys_target}"
-        var_cache = "/var/cache/${sys_name}/${sys_version}/${sys_target}"
+        var_lib_apt = "/var/lib/apt/${sys_name}/${sys_version}/${sys_target_triple(sys_target)}"
+        var_cache = "/var/cache/${sys_name}/${sys_version}/${sys_target_triple(sys_target)}"
         packages = join(" ", base_pkgs)
     }
 }
@@ -1746,13 +1768,21 @@ target "system" {
     cache_to = ["type=local,compression=zstd,mode=max,compression-level=${cache_compress_level}"]
     cache_from = ["type=local"]
     dockerfile = "${docker_dir}/Dockerfile.system"
-    platforms = jsondecode(docker_targets)
-    matrix = sys
     context = "."
+    matrix = sys
+    platforms = (
+        sys_target_triple(sys_target) == "x86_64-linux-gnu"?
+            ["linux/amd64/${sys_target_ver(sys_target)}"]:
+        sys_target_triple(sys_target) == "aarch64-linux-gnu"?
+            ["linux/arm64"]:
+            ["local"]
+    )
     args = {
         sys_name = sys_name
         sys_version = sys_version
         sys_target = sys_target
+        sys_triple = sys_target_triple(sys_target)
+        sys_isa = sys_target_isa(sys_target)
     }
 }
 
@@ -1761,6 +1791,33 @@ target "system" {
 # Utils
 #
 
+function "sys_target_isa" {
+    params = [sys_target]
+    result = (
+        sys_target_ver(sys_target) != "v1"?
+            join("-",
+            [
+                replace(split("-", sys_target)[0], "_", "-"),
+                sys_target_ver(sys_target)
+            ]):
+            replace(split("-", sys_target)[0], "_", "-")
+    )
+}
+
+function "sys_target_triple" {
+    params = [sys_target]
+    result = join("-", [
+        split("-", sys_target)[0],
+        split("-", sys_target)[2],
+        split("-", sys_target)[3],
+    ])
+}
+
+function "sys_target_ver" {
+    params = [sys_target]
+    result = split("-", sys_target)[1]
+}
+
 function "elem_tag" {
     params = [prefix, matrix, tag]
     result = join(":", [elem(prefix, matrix), tag])
diff --git a/docker/bake.sh b/docker/bake.sh
index 7e607c5d..48f36d5d 100755
--- a/docker/bake.sh
+++ b/docker/bake.sh
@@ -14,9 +14,8 @@ default_feat_sets='["all"]'
 default_rust_toolchains='["nightly"]'
 default_rust_targets='["x86_64-unknown-linux-gnu"]'
 default_sys_names='["debian"]'
-default_sys_targets='["x86_64-linux-gnu"]'
 default_sys_versions='["testing-slim"]'
-default_docker_targets='["local"]'
+default_sys_targets='["x86_64-v1-linux-gnu"]'
 
 if test ! -z "$cargo_profile"; then
     env_cargo_profiles="[\"${cargo_profile}\"]"
@@ -46,10 +45,6 @@ if test ! -z "$sys_version"; then
     env_sys_versions="[\"${sys_version}\"]"
 fi
 
-if test ! -z "$docker_target"; then
-    env_docker_targets="[\"${docker_target}\"]"
-fi
-
 set -a
 bake_target="${bake_target:-$@}"
 cargo_profiles="${env_cargo_profiles:-$default_cargo_profiles}"
@@ -59,7 +54,6 @@ rust_toolchains="${env_rust_toolchains:-$default_rust_toolchains}"
 sys_names="${env_sys_names:-$default_sys_names}"
 sys_targets="${env_sys_targets:-$default_sys_targets}"
 sys_versions="${env_sys_versions:-$default_sys_versions}"
-docker_targets="${env_docker_targets:-$default_docker_targets}"
 
 docker_dir="$PWD/$BASEDIR"
 builder_name="${GITHUB_ACTOR:-owo}"
diff --git a/docker/complement.sh b/docker/complement.sh
index 78007465..08818b63 100755
--- a/docker/complement.sh
+++ b/docker/complement.sh
@@ -12,7 +12,7 @@ default_feat_set="all"
 default_rust_toolchain="nightly"
 default_rust_target="x86_64-unknown-linux-gnu"
 default_sys_name="debian"
-default_sys_target="x86_64-linux-gnu"
+default_sys_target="x86_64-v1-linux-gnu"
 default_sys_version="testing-slim"
 
 set -a