diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
index b6446aac31a..ba100c71d3f 100644
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@ -252,7 +252,12 @@ jobs:
     - name: Get latest tag
       id: previoustag
       run: |
-        echo "version=$(echo ${{ github.event.ref }} | cut -d 'v' -f 2)" >> $GITHUB_OUTPUT
+        VERSION=$(echo ${{ github.event.ref }} | cut -d 'v' -f 2)
+        if [[ ${{ github.event.ref }} != *nightly* ]]; then
+          VERSION="${VERSION}-stable"
+        fi
+        
+        echo "version=${VERSION}" >> $GITHUB_OUTPUT
         echo "tag=$(echo ${{ github.event.ref }} | cut -d '/' -f 3)" >> $GITHUB_OUTPUT
         echo "SETUP_PREFIX=jans-linux" >> ${GITHUB_ENV}
         echo "TUI_PREFIX=jans-cli-tui-linux" >> ${GITHUB_ENV}
@@ -410,7 +415,7 @@ jobs:
    - name: Generate sha256sum and sign
      id: sign-cedarling
      run: |
-       TAG=$(echo ${{ github.event.ref }} | cut -d '/' -f 3)
+       TAG=$(echo ${{ github.event.ref }} | cut -d '/' -f 3 | sed 's/^v//')
        VERSION="${TAG}"
        if [ "${TAG}" == "nightly" ]; then
          VERSION=nightly