diff --git a/.github/actions/configure-environment/action.yml b/.github/actions/configure-environment/action.yml
index 230be0ff..7acde988 100644
--- a/.github/actions/configure-environment/action.yml
+++ b/.github/actions/configure-environment/action.yml
@@ -5,19 +5,17 @@ runs:
   using: 'composite'
   steps:
     - run: |
-        echo 'FIL_PROOFS_PARAMETER_CACHE="${GITHUB_WORKSPACE}/filecoin-proof-parameters/"' >> $GITHUB_ENV
+        echo "FIL_PROOFS_PARAMETER_CACHE=${GITHUB_WORKSPACE}/filecoin-proof-parameters/" >> $GITHUB_ENV
         echo 'GO111MODULE=on' >> $GITHUB_ENV
-        echo 'GOPATH="${GITHUB_WORKSPACE}/go"' >> $GITHUB_ENV
-        echo 'PATH="/usr/local/go/bin:${GITHUB_WORKSPACE}/.cargo/bin:${PATH}:${GITHUB_WORKSPACE}/go/bin:${GITHUB_WORKSPACE}/.bin"' >> $GITHUB_ENV
         echo 'RUST_LOG=info' >> $GITHUB_ENV
-        echo 'CIRCLE_ARTIFACTS="/tmp"' >> $GITHUB_ENV
-        # Make sure CUDA is found on aarch64
-        echo 'LD_LIBRARY_PATH="/usr/lib/aarch64-linux-gnu/stubs:${LD_LIBRARY_PATH}"' >> $GITHUB_ENV
-        echo 'LIBRARY_PATH="/usr/lib/aarch64-linux-gnu/stubs:${LIBRARY_PATH}"' >> $GITHUB_ENV
       shell: bash
+    - if: runner.os == 'Linux' && runner.arch == 'x86_64'
+      run: |
+        # Make sure CUDA is found on aarch64
+        echo 'LD_LIBRARY_PATH="/usr/lib/aarch64-linux-gnu/stubs:'"${LD_LIBRARY_PATH}"'"' >> $GITHUB_ENV
+        echo 'LIBRARY_PATH="/usr/lib/aarch64-linux-gnu/stubs:'"${LIBRARY_PATH}"'"' >> $GITHUB_ENV
     - if: runner.os == 'MacOS'
       run: |
-        echo 'export PATH="${GITHUB_WORKSPACE}/.cargo/bin:${GITHUB_WORKSPACE}/.bin:${PATH}"' >> $GITHUB_ENV
         echo 'export LIBRARY_PATH=/opt/homebrew/lib' >> $GITHUB_ENV
       shell: bash
     - if: runner.os == 'Linux'
@@ -30,7 +28,7 @@ runs:
       shell: bash
     - if: runner.os == 'MacOS'
       run: |
-        brew install filippo.io/age/age
+        HOMEBREW_NO_AUTO_UPDATE=1 brew install pkg-config md5sha1sum jq hwloc || brew link --overwrite python@2
       shell: bash
     - uses: dtolnay/rust-toolchain@21dc36fb71dd22e3317045c0c31a3f4249868b17
       with: