diff --git a/.forgejo/workflows/deploy_single_theme.yml b/.forgejo/workflows/deploy_single_theme.yml
index 1bd65d75b6..91956a8563 100644
--- a/.forgejo/workflows/deploy_single_theme.yml
+++ b/.forgejo/workflows/deploy_single_theme.yml
@@ -33,14 +33,19 @@ jobs:
         run: |
           BRANCH=${{ github.ref_name }}
           THEME=${BRANCH:6}
-          mv "dist_$THEME" ${{ github.ref_name }}
-          zip ${{ github.ref_name }}.zip -r ${{ github.ref_name }}/*
+          zip $THEME.zip -r dist_$THEME/*
 
       - name: uploading file
-        run: scp ${{ github.ref_name }}.zip hetzner:/root/staging/
+        run: |
+          BRANCH=${{ github.ref_name }}
+          THEME=${BRANCH:6}
+          scp $THEME.zip hetzner:/root/staging/
 
       - name: unzipping remote file
-        run: ssh hetzner "cd /root/staging && unzip ${{ github.ref_name }}.zip && rm -rf /root/single_theme_builds/${{ github.ref_name }} && mv /root/staging/${{ github.ref_name }}/ /root/single_theme_builds/ && rm ${{ github.ref_name }}.zip"
+        run: |
+          BRANCH=${{ github.ref_name }}
+          THEME=${BRANCH:6}
+          ssh hetzner "cd /root/staging && unzip $THEME.zip && rm -rf /root/single_theme_builds/$THEME && mv /root/staging/$THEME/ /root/single_theme_builds/ && rm $THEME.zip"