diff --git a/.github/workflows/cache-upload.yml b/.github/workflows/cache-upload.yml
index 2cd5b15..95d501b 100644
--- a/.github/workflows/cache-upload.yml
+++ b/.github/workflows/cache-upload.yml
@@ -14,7 +14,13 @@ jobs:
   build:
     strategy:
       fail-fast: false
-    runs-on: ubuntu-latest
+      matrix:
+        include:
+          - runner: [self-hosted, X64]
+            arch: amd64
+          - runner: [self-hosted, arm-runner]
+            arch: arm64
+    runs-on: ${{ matrix.runner }}
     name: nix-build
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
@@ -40,7 +46,7 @@ jobs:
 
       - name: build and copy to S3
         run: |
-          for x in 15 16 orioledb_16; do
+          for x in 15; do
             nix build .#psql_$x/bin -o result-$x
           done
           nix copy --to s3://nix-postgres-artifacts?secret-key=nix-secret-key ./result*
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index f65d2d8..1d097d9 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -38,6 +38,6 @@ jobs:
       - name: Push image to the Container registry
         run: |
           set -x
-          for x in 15 16 orioledb_16; do
+          for x in 15; do
             nix build .#psql_$x/docker.copyToRegistry          
           done
diff --git a/.github/workflows/nix-build.yml b/.github/workflows/nix-build.yml
index 958851e..03e33cd 100644
--- a/.github/workflows/nix-build.yml
+++ b/.github/workflows/nix-build.yml
@@ -13,9 +13,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-latest ]
-        cmd: [ "nix flake check -L --show-trace", "nix run nixpkgs#just -- build-all" ]
-    runs-on: ${{ matrix.os }}
+        include:
+          - runner: [self-hosted, X64]
+            arch: amd64
+          - runner: [self-hosted, arm-runner]
+            arch: arm64
+    runs-on: ${{ matrix.runner }}
     name: nix-build
     steps:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
@@ -23,4 +26,4 @@ jobs:
           fetch-depth: 0
       - uses: DeterminateSystems/nix-installer-action@65d7c888b2778e8cf30a07a88422ccb23499bfb8
       - uses: DeterminateSystems/magic-nix-cache-action@749fc5bbc9fa49d60c2b93f6c4bc867b82e1d295
-      - run: ${{ matrix.cmd }}
+      - run: [ "nix flake check -L --show-trace", "nix run nixpkgs#just -- build-all" ]
diff --git a/justfile b/justfile
index e8360fc..a023b40 100755
--- a/justfile
+++ b/justfile
@@ -10,8 +10,8 @@ alias c := check
 
 build-all:
     nix build .#psql_15/bin .#psql_15/docker
-    nix build .#psql_16/bin .#psql_16/docker
-    nix build .#psql_orioledb_16/bin .#psql_orioledb_16/docker
+    # nix build .#psql_16/bin .#psql_16/docker
+    # nix build .#psql_orioledb_16/bin .#psql_orioledb_16/docker
 
 check:
     nix flake check -L