diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5d8927ceff1..93a9086573b 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,6 +18,9 @@ jobs:
             triple: x86_64-unknown-linux-gnu
           - os: ubuntu-22.04-arm
             triple: aarch64-unknown-linux-gnu
+        channel:
+          - stable
+          - nightly
     runs-on: ${{ matrix.os }}
     steps:
       - name: Install nightly toolchain
@@ -40,17 +43,24 @@ jobs:
           submodules: "recursive"
           path: rust
 
+      - name: Configure channel
+        run: |
+          sed -i.bak 's/channel = "stable"/channel = "${{ matrix.channel }}"/' config.toml
+          echo "Building with channel: ${{ matrix.channel }}"
+          cat config.toml
+        working-directory: rust
+
       - name: Build
         run: make build-toolchain
         working-directory: rust
 
       - name: Archive
-        run: tar -czvf rust-toolchain-${{ matrix.triple }}.tar.gz rust/build/host/stage2
+        run: tar -czvf rust-toolchain-${{ matrix.channel }}-${{ matrix.triple }}.tar.gz rust/build/host/stage2
 
       - name: Generate tag name
         id: tag
         run: |
-          echo "::set-output name=release_tag::stable-${GITHUB_SHA}"
+          echo "release_tag=${{ matrix.channel }}-${GITHUB_SHA}" >> $GITHUB_OUTPUT
 
       - name: Release
         uses: softprops/action-gh-release@v1
@@ -58,6 +68,6 @@ jobs:
           tag_name: ${{ steps.tag.outputs.release_tag }}
           prerelease: true
           files: |
-            rust-toolchain-${{ matrix.triple }}.tar.gz
+            rust-toolchain-${{ matrix.channel }}-${{ matrix.triple }}.tar.gz
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}