diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
index ba100c71d3f..23790e808da 100644
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@ -86,7 +86,7 @@ jobs:
         if [[ ${{ github.event.ref }} == 'refs/tags/nightly' ]]; then
           echo "version=0.0.0-nightly" >> $GITHUB_OUTPUT
         else
-          echo "version=$(echo ${{ github.event.ref }} | cut -d 'v' -f 2)" >> $GITHUB_OUTPUT
+          echo "version=$(echo ${{ github.event.ref }} | cut -d 'v' -f 2)-stable" >> $GITHUB_OUTPUT
         fi
         echo "PACKAGE_PREFIX=jans" >> ${GITHUB_ENV}
 
@@ -252,10 +252,6 @@ jobs:
     - name: Get latest tag
       id: previoustag
       run: |
-        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
@@ -370,8 +366,8 @@ jobs:
     - name: Generate sha256sum and sign
       id: sign-cedarling
       run: |
-        TAG=$(echo ${{ github.event.ref }} | cut -d '/' -f 3)
-        VERSION="${TAG}"
+        TAG=$(echo ${{ github.event.ref }} | cut -d '/' -f 3 | sed 's/^v//')
+        VERSION="$(echo ${{ github.event.ref }} | cut -d '/' -f 3)"
         if [ "${TAG}" == "nightly" ]; then
           VERSION=nightly
           TAG="0.0.0"
@@ -416,7 +412,7 @@ jobs:
      id: sign-cedarling
      run: |
        TAG=$(echo ${{ github.event.ref }} | cut -d '/' -f 3 | sed 's/^v//')
-       VERSION="${TAG}"
+       VERSION="$(echo ${{ github.event.ref }} | cut -d '/' -f 3)"
        if [ "${TAG}" == "nightly" ]; then
          VERSION=nightly
          TAG="0.0.0"