diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index cb125b89b3..33ed7eb9f0 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -76,6 +76,7 @@ jobs:
           version: ${{ github.repository_owner == 'subspace' && '17.0.6' || '15' }}
           # TODO: Remove specific patch release and force version once https://github.com/KyleMayes/install-llvm-action/issues/61 is resolved
           force-version: true
+          env: true
         if: runner.os == 'macOS'
 
       - name: Install Protoc
@@ -156,6 +157,7 @@ jobs:
           version: ${{ github.repository_owner == 'subspace' && '17.0.6' || '15' }}
           # TODO: Remove specific patch release and force version once https://github.com/KyleMayes/install-llvm-action/issues/61 is resolved
           force-version: true
+          env: true
         if: runner.os == 'macOS'
 
       - name: Install Protoc
diff --git a/.github/workflows/snapshot-build.yml b/.github/workflows/snapshot-build.yml
index 5fca326273..0e95289aa4 100644
--- a/.github/workflows/snapshot-build.yml
+++ b/.github/workflows/snapshot-build.yml
@@ -133,6 +133,7 @@ jobs:
           version: ${{ github.repository_owner == 'subspace' && '17.0.6' || '15' }}
           # TODO: Remove specific patch release and force version once https://github.com/KyleMayes/install-llvm-action/issues/61 is resolved
           force-version: true
+          env: true
         if: runner.os == 'macOS'
 
       - name: Install Protoc
@@ -192,20 +193,11 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-cargo-
 
-      - name: Build farmer (Linux and Windows)
+      - name: Build farmer
         uses: actions-rs/cargo@ae10961054e4aa8b4aa7dffede299aaf087aa33b # @v1.0.1
         with:
           command: build
           args: --locked -Z build-std --target ${{ matrix.build.target }} --profile production --bin subspace-farmer
-        if: runner.os != 'macOS'
-
-      # We build macOS without `numa` feature, primarily because of https://github.com/HadrienG2/hwlocality/issues/31
-      - name: Build farmer (macOS)
-        uses: actions-rs/cargo@ae10961054e4aa8b4aa7dffede299aaf087aa33b # @v1.0.1
-        with:
-          command: build
-          args: --locked -Z build-std --target ${{ matrix.build.target }} --profile production --bin subspace-farmer --no-default-features
-        if: runner.os == 'macOS'
 
       - name: Build node
         uses: actions-rs/cargo@ae10961054e4aa8b4aa7dffede299aaf087aa33b # @v1.0.1