diff --git a/.github/workflows/apiserver.yml b/.github/workflows/apiserver.yml
index 9e63b33..e5b353c 100644
--- a/.github/workflows/apiserver.yml
+++ b/.github/workflows/apiserver.yml
@@ -57,7 +57,7 @@ jobs:
           --group root:0
           --mtime '2024-01-01 00:00Z'
           --pax-option exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime
-          -f apiserver-{}.tar.zst
+          -f apiserver-"$GITHUB_RUN_NUMBER"-$(lsb_release --id --short | tr '[:upper:]' '[:lower:]')-$(lsb_release --release --short)-$(dpkg --print-architecture).tar.zst
           -C apiserver
           .
 
@@ -71,7 +71,7 @@ jobs:
   deploy:
     runs-on: ubuntu-24.04
     needs: build
-    if: github.ref == 'refs/heads/main' || github.event.inputs.deploy == 'true'
+    if: github.ref == 'refs/heads/hetzner' || github.event.inputs.deploy == 'true'
     environment: deploy
     permissions:
       contents: write