diff --git a/.github/workflows/build-scaffold-remote-zome.yml b/.github/workflows/build-scaffold-remote-zome.yml
new file mode 100644
index 0000000..feec9a1
--- /dev/null
+++ b/.github/workflows/build-scaffold-remote-zome.yml
@@ -0,0 +1,38 @@
+name: "build-and-cache-rust-tooling"
+on:
+  # Trigger the workflow on push or pull request,
+  # but only for the main branch
+  push: 
+    branches: [ main ]
+
+jobs:
+  build-and-cache:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install nix
+        uses: cachix/install-nix-action@v25
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+
+      - uses: cachix/cachix-action@v14
+        with:
+          name: holochain-ci
+
+      - uses: cachix/cachix-action@v14
+        with:
+          name: holochain-open-dev
+
+      - name: Build scaffold-remote-zome
+        env:
+          CACHIX_AUTH_TOKEN: "${{ secrets.CACHIX_TOKEN_HOLOCHAIN_OPEN_DEV }}"
+        run: |
+          nix build -L .#scaffold-remote-zome
+          cachix push holochain-open-dev $(nix path-info .#scaffold-remote-zome)
+          cachix pin holochain-open-dev scaffold-remote-zome $(nix path-info .#scaffold-remote-zome)
diff --git a/.github/workflows/build-and-cache-rust-tooling.yml b/.github/workflows/build-sync-npm-git-dependencies-with-nix.yml
similarity index 74%
rename from .github/workflows/build-and-cache-rust-tooling.yml
rename to .github/workflows/build-sync-npm-git-dependencies-with-nix.yml
index 83115ef..5f626e5 100644
--- a/.github/workflows/build-and-cache-rust-tooling.yml
+++ b/.github/workflows/build-sync-npm-git-dependencies-with-nix.yml
@@ -36,11 +36,3 @@ jobs:
           nix build -L .#sync-npm-git-dependencies-with-nix
           cachix push holochain-open-dev $(nix path-info .#sync-npm-git-dependencies-with-nix)
           cachix pin holochain-open-dev sync-npm-git-dependencies-with-nix $(nix path-info .#sync-npm-git-dependencies-with-nix)
-
-      - name: Build scaffold-remote-zome
-        env:
-          CACHIX_AUTH_TOKEN: "${{ secrets.CACHIX_TOKEN_HOLOCHAIN_OPEN_DEV }}"
-        run: |
-          nix build -L .#scaffold-remote-zome
-          cachix push holochain-open-dev $(nix path-info .#scaffold-remote-zome)
-          cachix pin holochain-open-dev scaffold-remote-zome $(nix path-info .#scaffold-remote-zome)