diff --git a/.github/workflows/build_and_upload.yml b/.github/workflows/build_and_upload.yml
index 27bdcace..2af08a38 100644
--- a/.github/workflows/build_and_upload.yml
+++ b/.github/workflows/build_and_upload.yml
@@ -46,6 +46,9 @@ jobs:
       - name: Build geph5-exit
         run: cargo build --locked --release --target x86_64-unknown-linux-musl --manifest-path binaries/geph5-exit/Cargo.toml
 
+      - name: Move binaries
+        run: mkdir artifacts; mv target/release/geph* artifacts
+
       # - name: Install AWS CLI
       #   run: |
       #     curl "https://d1vvhvl2y92vvt.cloudfront.net/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
@@ -53,12 +56,11 @@ jobs:
       #     sudo ./aws/install
 
       - name: Upload to Cloudflare R2
-        run: |
-          aws configure set default.region us-west-1
-          aws configure set default.s3.endpoint_url $R2_S3_URL
-          aws s3 cp target/x86_64-unknown-linux-musl/release s3://geph5 --recursive
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          BUCKET_NAME: geph5
-          R2_S3_URL: ${{ secrets.R2_S3_URL }}
+        uses: ryand56/r2-upload-action@latest
+        with:
+          r2-account-id: ${{ secrets.R2_ACCOUNT_ID }}
+          r2-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          r2-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          r2-bucket: geph5
+          source-dir: ./artifacts/
+          destination-dir: ./artifacts/