diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
index c100b76..8928551 100644
--- a/.github/workflows/pre-release.yml
+++ b/.github/workflows/pre-release.yml
@@ -17,11 +17,20 @@ jobs:
         with:
           submodules: recursive
 
+      - name: Initial variables
+        id: vars
+        run: |
+          echo ::set-output name=VERSION::$(git tag --sort=-v:refname --list "v[0-9]*" | head -n 1 | cut -c 2-)
+          echo ::set-output name=SHA::$(echo ${GITHUB_SHA} | cut -c1-8)
+
       - name: "Archive all"
         run: |
           python -m pip install --upgrade pip
           pip install git-archive-all
-          git-archive-all --force-submodules --prefix=globalprotect-openconnect-latest/ ./globalprotect-openconnect_latest.orig.tar.gz
+          git-archive-all \
+            --force-submodules \
+            --prefix=globalprotect-openconnect-${{ steps.vars.outputs.VERSION }}+r${{ steps.vars.outputs.SHA}}/ \
+            ./globalprotect-openconnect_${{ steps.vars.outputs.VERSION }}+r${{ steps.vars.outputs.SHA }}.orig.tar.gz
 
       - uses: "marvinpinto/action-automatic-releases@latest"
         with: