diff --git a/.github/workflows/build-binaries.yaml b/.github/workflows/build-binaries.yaml
index 2448c8f..566c450 100644
--- a/.github/workflows/build-binaries.yaml
+++ b/.github/workflows/build-binaries.yaml
@@ -26,3 +26,6 @@ jobs:
 
       - name: List files
         run: file output/*
+
+      - name: Cleanup
+        run: rm output/*
diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml
index 1a7b072..e79b64d 100644
--- a/.github/workflows/build-images.yaml
+++ b/.github/workflows/build-images.yaml
@@ -1,6 +1,8 @@
 name: Build Docker images
 
-on: [pull_request]
+on:
+  pull_request_review:
+    types: [submitted]
 
 env:
   REGISTRY: ghcr.io
@@ -8,6 +10,8 @@ env:
 
 jobs:
   build-and-push-image:
+    # Build image only if PR is approved to avoid having too many random images
+    if: github.event.review.state == 'approved'
     runs-on: ubuntu-latest
     permissions:
       contents: read
diff --git a/.github/workflows/publish-release-binaries.yaml b/.github/workflows/publish-release-binaries.yaml
index f267bbd..f10b285 100644
--- a/.github/workflows/publish-release-binaries.yaml
+++ b/.github/workflows/publish-release-binaries.yaml
@@ -40,3 +40,6 @@ jobs:
         with:
           files: "output/*"
           repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Cleanup
+        run: rm output/*
diff --git a/Makefile b/Makefile
index 2ded478..8269a1a 100644
--- a/Makefile
+++ b/Makefile
@@ -46,23 +46,19 @@ test: $(VENDOR_DIR)
 .PHONY: build-ubuntu-latest
 build-ubuntu-latest: $(VENDOR_DIR) $(OUTPUT_DIR)
 	CGO_ENABLED=1 go build -a -ldflags '-extldflags "-static"' -o output/minigun .
-	tar czf output/minigun-linux-amd64.tar.gz output/minigun
-	rm -f output/minigun
+	cd output && file minigun && tar czf minigun-linux-amd64.tar.gz minigun && rm -f minigun
 	GOARCH=arm64 CGO_ENABLED=0 go build -a -ldflags '-extldflags "-static"' -o output/minigun .
-	tar czf output/minigun-linux-arm64.tar.gz output/minigun
-	rm -f output/minigun
+	cd output && file minigun && tar czf minigun-linux-arm64.tar.gz minigun && rm -f minigun
 
 .PHONY: build-macos-latest
 build-macos-latest: $(VENDOR_DIR) $(OUTPUT_DIR)
 	CGO_ENABLED=1 go build -a -ldflags '-extldflags "-static"' -o output/minigun .
-	tar czf output/minigun-darwin-amd64.tar.gz output/minigun
+	cd output && file minigun && tar czf minigun-darwin-amd64.tar.gz minigun && rm -f minigun
 	rm -f output/minigun
 	GOARCH=arm64 CGO_ENABLED=0 go build -a -ldflags '-extldflags "-static"' -o output/minigun .
-	tar czf output/minigun-darwin-arm64.tar.gz output/minigun
-	rm -f output/minigun
+	cd output && file minigun && tar czf minigun-darwin-arm64.tar.gz minigun && rm -f minigun
 
 .PHONY: build-windows-latest
 build-windows-latest: $(VENDOR_DIR) $(OUTPUT_DIR)
 	CGO_ENABLED=1 go build -a -ldflags '-extldflags "-static"' -o output/minigun.exe .
-	tar czf output/minigun-win64.tar.gz output/minigun.exe
-	rm -f output/minigun.exe
+	cd output && tar czf minigun-win64.tar.gz minigun.exe && rm -f minigun.exe