diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
index 933de9d..49db03a 100644
--- a/.github/workflows/compile.yml
+++ b/.github/workflows/compile.yml
@@ -43,20 +43,20 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Build and push
+      - name: Build and push amd
         run: |
-          cp target/x86_64-unknown-linux-musl/release/easypwned easypwned
-          cp target/x86_64-unknown-linux-musl/release/easypwned_haveibeenpwned_downloader easypwned_haveibeenpwned_downloader
-          docker buildx build --platform linux/amd64 -t easybill/easypwned:latest_amd64 --push .
           cp target/aarch64-unknown-linux-musl/release/easypwned easypwned
           cp target/aarch64-unknown-linux-musl/release/easypwned_haveibeenpwned_downloader easypwned_haveibeenpwned_downloader
-          docker buildx build --platform linux/arm64 -t easybill/easypwned:latest_arm64 --push .
-          docker manifest create easybill/easypwned:latest easybill/easypwned:latest_amd64 easybill/easypwned:latest_arm64
-          docker manifest push easybill/easypwned:latest
-      - name: Build and push release
+          docker buildx build --platform linux/arm64 -t easybill/easypwned:${{github.ref_name}}_arm64 --push .
+      - name: Build and push arm
+        run: |
+          cp target/aarch64-unknown-linux-musl/release/easypwned easypwned
+          cp target/aarch64-unknown-linux-musl/release/easypwned_haveibeenpwned_downloader easypwned_haveibeenpwned_downloader
+          docker buildx build --platform linux/arm64 -t easybill/easypwned:${{github.ref_name}}_arm64 --push .
+      - name: Build and Push manifest
         if: startsWith(github.ref, 'refs/tags/')
         run: |
-          docker manifest create easybill/easypwned:${{ steps.vars.outputs.tag }} easybill/easypwned:latest_amd64 easybill/easypwned:latest_arm64
+          docker manifest create easybill/easypwned:${{ steps.vars.outputs.tag }} easybill/easypwned:${{github.ref_name}}_amd64 easybill/easypwned:${{github.ref_name}}_arm64
           docker manifest push easybill/easypwned:${{ steps.vars.outputs.tag }}
       - name: Release Build
         if: startsWith(github.ref, 'refs/tags/')