diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 386ca0080fd..c125ba5a095 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -70,5 +70,5 @@ jobs:
             VERSION=${{ steps.get_version.outputs.VERSION }}
           tags: |
             dragonflyoss/client:${{ steps.get_version.outputs.VERSION }}
-            ghcr.io/${{ env.IMAGE_REPOSITORY }}/client:${{ steps.get_version.outputs.VERSION }}
+            ghcr.io/${{ env.IMAGE_REPOSITORY }}:${{ steps.get_version.outputs.VERSION }}
           push: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 746a3a01b18..a21d42ca855 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -6,23 +6,15 @@ on:
       - v*
 
 jobs:
-  release-github:
-    runs-on: ${{ matrix.os }}
+  build-cross:
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        include:
-          - build: linux
-            os: ubuntu-latest
-            target: x86_64-unknown-linux-gnu
-          - build: linux
-            os: ubuntu-latest
-            target: x86_64-unknown-linux-musl
-          - build: linux
-            os: ubuntu-latest
-            target: aarch64-unknown-linux-gnu
-          - build: linux
-            os: ubuntu-latest
-            target: aarch64-unknown-linux-musl
+        target:
+          - x86_64-unknown-linux-gnu
+          - x86_64-unknown-linux-musl
+          - aarch64-unknown-linux-gnu
+          - aarch64-unknown-linux-musl
 
     steps:
       - name: Checkout
@@ -33,16 +25,15 @@ jobs:
         run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
 
       - name: Install Rust
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          targets: ${{ matrix.target }}
-          override: true
-
-      - name: Install dependencies
-        shell: bash
         run: |
-          sudo apt-get update 
-          sudo apt-get install -y pkg-config libssl-dev libclang-dev protobuf-compiler -build-essential libudev-dev perl
+          rustup set profile minimal
+          rustup toolchain install stable
+          rustup default stable
+          rustup override set stable
+          rustup target add --toolchain stable ${{ matrix.target }}
+
+      - name: Install cross
+        run: cargo install cross
 
       - name: Build
         uses: actions-rs/cargo@v1