diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 83ad1298a..5b4ce4420 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
           ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock', '**/Cargo.toml') }}
           ${{ runner.os }}-cargo-
     - name: Install minimal stable with clippy and rustfmt
-      uses: actions-rs/toolchain@v1
+      uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         profile: default
         toolchain: stable
@@ -69,10 +69,11 @@ jobs:
           database-1-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock', '**/Cargo.toml') }}
           database-1-${{ runner.os }}-cargo-
     - name: Install nightly rust
-      uses: actions-rs/toolchain@v1
+      uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         profile: default
         toolchain: nightly-${{ env.RUST_TC_NIGHTLY_VER }}
+        components: clippy
         override: true
     - name: Check
       run: cargo clippy --features database
@@ -105,7 +106,7 @@ jobs:
           s3-1-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock', '**/Cargo.toml') }}
           s3-1-${{ runner.os }}-cargo-
     - name: Install nightly rust
-      uses: actions-rs/toolchain@v1
+      uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         profile: default
         # toolchain: nightly
@@ -166,7 +167,7 @@ jobs:
           s3-1-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock', '**/Cargo.toml') }}
           s3-1-${{ runner.os }}-cargo-
     - name: Install nightly rust
-      uses: actions-rs/toolchain@v1
+      uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         profile: default
         # toolchain: nightly
@@ -213,7 +214,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Install minimal stable with clippy and rustfmt
-      uses: actions-rs/toolchain@v1
+      uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         profile: default
         toolchain: stable
@@ -244,7 +245,7 @@ jobs:
           mac-1-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock', '**/Cargo.toml') }}
           mac-1-${{ runner.os }}-cargo-
     - name: Install Rust toolchain
-      uses: actions-rs/toolchain@v1
+      uses: actions-rust-lang/setup-rust-toolchain@v1
       with:
         toolchain: nightly-${{ env.RUST_TC_NIGHTLY_VER }}
         target: aarch64-apple-darwin
diff --git a/.github/workflows/columnq_cli_release.yml b/.github/workflows/columnq_cli_release.yml
index f2bace7db..668d9ed25 100644
--- a/.github/workflows/columnq_cli_release.yml
+++ b/.github/workflows/columnq_cli_release.yml
@@ -41,10 +41,10 @@ jobs:
         with:
           python-version: "3.10"
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: nightly-${{ env.RUST_TC_NIGHTLY_VER }}
-          target: aarch64-apple-darwin
+          target: aarch64-apple-darwin,x86_64-apple-darwin
           profile: minimal
           default: true
       - name: Install maturin
@@ -97,7 +97,7 @@ jobs:
           python-version: "3.10"
           architecture: ${{ matrix.platform.python-architecture }}
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: nightly-${{ env.RUST_TC_NIGHTLY_VER }}
           target: ${{ matrix.platform.target }}
diff --git a/.github/workflows/roapi_release.yml b/.github/workflows/roapi_release.yml
index 73f80bd25..3baac6e30 100644
--- a/.github/workflows/roapi_release.yml
+++ b/.github/workflows/roapi_release.yml
@@ -43,10 +43,10 @@ jobs:
         with:
           python-version: "3.10"
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: nightly-${{ env.RUST_TC_NIGHTLY_VER }}
-          target: aarch64-apple-darwin
+          target: aarch64-apple-darwin,x86_64-apple-darwin
           profile: minimal
           default: true
       - name: Install maturin
@@ -98,7 +98,7 @@ jobs:
           python-version: "3.10"
           architecture: ${{ matrix.platform.python-architecture }}
       - name: Install Rust toolchain
-        uses: actions-rs/toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1
         with:
           toolchain: nightly-${{ env.RUST_TC_NIGHTLY_VER }}
           target: ${{ matrix.platform.target }}