diff --git a/.github/workflows/update-versions.yml b/.github/workflows/update-versions.yml
index f221a0c..5cfc6c5 100644
--- a/.github/workflows/update-versions.yml
+++ b/.github/workflows/update-versions.yml
@@ -85,12 +85,15 @@ jobs:
             (git commit -m "chore: update Node.js versions" && git push)
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.runner.os }}
     needs: [generate-matrix, update]
     strategy:
       fail-fast: false
       matrix:
         version: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
+        runner:
+          - { system: aarch64-darwin, os: macos-latest }
+          - { system: x86_64-linux, os: ubuntu-latest }
 
     steps:
       - uses: actions/checkout@v4
@@ -116,7 +119,7 @@ jobs:
 
       - name: Build ${{ matrix.version }} version
         run: |
-          TARGET_SYSTEM="x86_64-linux"
+          TARGET_SYSTEM=${{ matrix.runner.system }}
           cachix watch-store nixpkgs-nodejs &
           WATCH_PID=$!
 
@@ -127,7 +130,7 @@ jobs:
 
       - name: Verify Cachix upload
         run: |
-          TARGET_SYSTEM="x86_64-linux"
+          TARGET_SYSTEM=${{ matrix.runner.system }}
 
           OUT_PATH=$(nix build .#packages.$TARGET_SYSTEM.\"${{ matrix.version }}\" --print-out-paths --no-link)
           echo "Built package at: $OUT_PATH"
diff --git a/versions.json b/versions.json
index 66039cc..10439c8 100644
--- a/versions.json
+++ b/versions.json
@@ -14,8 +14,8 @@
     },
     "16.18": {
       "version": "16.18",
-      "rev": "3c3b3ab88a34ff8026fc69cb78febb9ec9aedb16",
-      "sha256": "19ag9878rzd9fqch0gcpgkhbdxssa08lmqwbixhr06q0h00xixxx",
+      "rev": "a3d5f09dfd7134153136d3153820a0642898cc9d",
+      "sha256": "1lp6qwdh1kp42dyravkxwj2qnsb3ngi1a5gmd9hzlds1r5q5bzrb",
       "attr": "nodejs-16_x"
     },
     "16.20": {
@@ -26,15 +26,15 @@
     },
     "18.16": {
       "version": "18.16",
-      "rev": "50a7139fbd1acd4a3d4cfa695e694c529dd26f3a",
-      "sha256": "1rh75qfcdbczm2rdzqni21xj0wc8f92mhnpwq5mv3z0yy8f35krl",
-      "attr": "elmPackages.nodejs"
+      "rev": "75f22e0d83812b4b95e9a83e9fe7025df8c39d98",
+      "sha256": "1aqiwpx6i69fr37a92n9s5ljqp3r13b37yfpryayggk01wq8fjaf",
+      "attr": "nodejs_18"
     },
     "18.18": {
       "version": "18.18",
-      "rev": "459104f841356362bfb9ce1c788c1d42846b2454",
-      "sha256": "1s34wcx14klzcvxwhfdyx4hq2q2rfzk6lgivr5mw6bi2mxn5844f",
-      "attr": "elmPackages.nodejs"
+      "rev": "b034e4cbf12f7c0d749674c102e31e6a47fa2d7f",
+      "sha256": "1xb16154bir6pykr2mz5gkqziqa6smblwpk7vh265x01fdhfh1qk",
+      "attr": "nodejs_18"
     },
     "18.20": {
       "version": "18.20",
@@ -50,15 +50,15 @@
     },
     "20.10": {
       "version": "20.10",
-      "rev": "c407032be28ca2236f45c49cfb2b8b3885294f7f",
-      "sha256": "1a95d5g5frzgbywpq7z0az8ap99fljqk3pkm296asrvns8qcv5bv",
-      "attr": "elmPackages.nodejs"
+      "rev": "120a67bbfa93d9fd830310344cae0291068318bd",
+      "sha256": "1iyamrjpkzwg4j790jjwbpy50a01l0dsdnnf5g7rzccl0zlg93ck",
+      "attr": "nodejs_20"
     },
     "20.12": {
       "version": "20.12",
-      "rev": "67b4bf1df4ae54d6866d78ccbd1ac7e8a8db8b73",
-      "sha256": "07gzgcgaclgand7j99w45r07gc464b5jbpaa3wmv6nzwzdb3v3q4",
-      "attr": "elmPackages.nodejs"
+      "rev": "655ba319013eacae89bd20aa5b793613c8baeefd",
+      "sha256": "1nmqshjs559yvscai87nqp87ig8prxhp2n20m424vh9zbisa0grk",
+      "attr": "nodejs_20"
     },
     "20.14": {
       "version": "20.14",