diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 38e5a61..e69f002 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -21,16 +21,11 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: cloudflare/boringtun
-      - uses: actions-rs/toolchain@v1
+      - name: Build binary
+        uses: houseabsolute/actions-rust-cross@v0
         with:
-          toolchain: stable
           target: ${{ matrix.target }}
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          use-cross: true
-          command: build
-          args: --release --target=${{ matrix.target }}
+          args: --release
       - uses: actions/upload-artifact@v2
         with:
           name: ${{ matrix.target }}
@@ -75,7 +70,7 @@ jobs:
           context: .
           file: ./Dockerfile
           platforms: linux/arm64, linux/arm, linux/amd64
-          push: true
+          push: ${{github.event_name == 'push'}}
           build-args: |
             FROM=debian:stable-slim
           tags: |-
diff --git a/.github/workflows/build_alpine.yaml b/.github/workflows/build_alpine.yaml
index f164c8f..ac2c06b 100644
--- a/.github/workflows/build_alpine.yaml
+++ b/.github/workflows/build_alpine.yaml
@@ -21,16 +21,15 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: cloudflare/boringtun
-      - uses: actions-rs/toolchain@v1
+      - name: Build binary
+        uses: houseabsolute/actions-rust-cross@v0
         with:
-          toolchain: stable
           target: ${{ matrix.target }}
-          override: true
-      - uses: actions-rs/cargo@v1
+          args: --release
+      - uses: actions/upload-artifact@v2
         with:
-          use-cross: true
-          command: build
-          args: --release --target=${{ matrix.target }}
+          name: ${{ matrix.target }}
+          path: target/${{ matrix.target }}/release/boringtun-cli
       - uses: actions/upload-artifact@v2
         with:
           name: ${{ matrix.target }}
@@ -75,7 +74,7 @@ jobs:
           context: .
           platforms: linux/arm64, linux/arm, linux/amd64
           file: ./Dockerfile
-          push: true
+          push: ${{github.event_name == 'push'}}
           build-args: |
             FROM=alpine:3.17
           tags: |-