diff --git a/.github/actions/setup-anchor/action.yml b/.github/actions/setup-anchor/action.yml
new file mode 100644
index 000000000..7453af862
--- /dev/null
+++ b/.github/actions/setup-anchor/action.yml
@@ -0,0 +1,39 @@
+# adapted from https://github.com/metaDAOproject/setup-anchor
+name: "Setup Anchor"
+description: "Install Anchor, Solana CLI tools, and Node.js."
+branding:
+  icon: anchor
+  color: blue
+inputs:
+  node-version:
+    description: "Version of node.js to use"
+    required: true
+  solana-cli-version:
+    description: "Version of Solana CLI to use"
+    required: true
+  anchor-version:
+    description: "Version of Anchor to use"
+    required: true
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/setup-node@v4
+      with:
+        node-version: ${{ inputs.node-version }}
+    - name: Cache Solana CLI tools
+      uses: actions/cache@v4
+      with:
+        path: |
+          ~/.cache/solana/
+          ~/.local/share/solana/
+        key: solana-cli-${{ runner.os }}-build-${{ inputs.solana-cli-version }}
+    - name: Install Solana CLI tools
+      run: |
+        sh -c "$(curl -sSfL https://release.anza.xyz/v${{ inputs.solana-cli-version }}/install)"
+      shell: bash
+    - name: Update PATH
+      run: echo "/home/runner/.local/share/solana/install/active_release/bin" >> $GITHUB_PATH
+      shell: bash
+    - name: Install Anchor
+      run: npm i -g @coral-xyz/anchor-cli@${{ inputs.anchor-version }}
+      shell: bash
diff --git a/.github/workflows/solana.yml b/.github/workflows/solana.yml
index 9b10fb3f7..8ad21dfec 100644
--- a/.github/workflows/solana.yml
+++ b/.github/workflows/solana.yml
@@ -17,9 +17,9 @@ jobs:
     runs-on: tilt-kube-public
     env:
       RUSTFLAGS: -Dwarnings
-
     steps:
       - uses: actions/checkout@v3
+
       - name: Get rust toolchain version
         id: toolchain
         run: |
@@ -68,7 +68,7 @@ jobs:
         env:
           SOLANA_VERSION: ${{ steps.solana.outputs.version }}
         run: |
-          sh -c "$(curl -sSfL https://release.solana.com/v${SOLANA_VERSION}/install)"
+          sh -c "$(curl -sSfL https://release.anza.xyz/v${SOLANA_VERSION}/install)"
           ~/.local/share/solana/install/active_release/bin/sdk/sbf/scripts/install.sh
 
       - name: cargo build-sbf && cargo test-sbf && cargo test
@@ -83,60 +83,78 @@ jobs:
           cargo build-sbf --features "mainnet"
           cargo test-sbf --features "mainnet"
           cargo test
+
   check-version:
     name: Check version
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+
       - run: ./scripts/sync-versions --check
         shell: bash
 
   anchor-test:
     name: Anchor Test
     runs-on: ubuntu-latest
+    env:
+      node-version: "20.11.0"
+      solana-cli-version: "1.18.26"
+      anchor-version: "0.29.0"
     steps:
       - uses: actions/checkout@v4
-      - uses: metadaoproject/setup-anchor@v2
+
+      - uses: ./.github/actions/setup-anchor
         with:
-          node-version: "20.11.0"
-          solana-cli-version: "1.18.26"
-          anchor-version: "0.29.0"
+          anchor-version: ${{ env.anchor-version }}
+          solana-cli-version: ${{ env.solana-cli-version }}
+          node-version: ${{ env.node-version }}
+
       - name: Cache node_modules
         uses: actions/cache@v3
         with:
           path: ./solana/node_modules/
-          key: node-modules-${{ runner.os }}-build-${{ inputs.node-version }}
+          key: node-modules-${{ runner.os }}-build-${{ env.node-version }}
+
       - name: Install node_modules
         run: make node_modules
         shell: bash
+
       - name: Create keypair
         run: solana-keygen new --no-bip39-passphrase
         shell: bash
+
       - name: Make Anchor.toml compatible with runner
         run: sed -i 's:/user/:/runner/:' Anchor.toml
         shell: bash
+
       - name: Install Cargo toolchain
         uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
           profile: minimal
           components: rustc
+
       - name: Cache Cargo dependencies
         uses: Swatinem/rust-cache@v2
         with:
           workspaces: "solana"
+
       - name: Setup SDK
         run: make sdk
         shell: bash
+
       - name: Check idl
         run: |
           git diff --exit-code ts/idl
+
       - name: Set default Rust toolchain
         run: rustup default stable
         shell: bash
+
       - name: Run anchor lint
         run: make anchor-lint
         shell: bash
+
       - name: Run tests
         run: anchor test --skip-build
         shell: bash