diff --git a/.github/actions/os_build_variables/action.yml b/.github/actions/os_build_variables/action.yml
index 8e6c43f2b..2fca9a71e 100644
--- a/.github/actions/os_build_variables/action.yml
+++ b/.github/actions/os_build_variables/action.yml
@@ -261,20 +261,13 @@ runs:
         echo "rawImagePath=${basePath}/mkosi.output.gcp/fedora~37/image.raw" >> $GITHUB_OUTPUT
         echo "imagePath=${basePath}/mkosi.output.gcp/fedora~37/image.tar.gz" >> $GITHUB_OUTPUT
         echo "jsonOutput=${basePath}/mkosi.output.gcp/fedora~37/image-upload.json" >> $GITHUB_OUTPUT
+        echo "imageName=constellation-${imageVersion//./-}" >> $GITHUB_OUTPUT
+        echo "imageFilename=constellation-${imageVersion//./-}.tar.gz" >> $GITHUB_OUTPUT
         if [[ "${stream}" = "stable" ]]
         then
-          echo "imageName=constellation-${imageVersion//./-}" >> $GITHUB_OUTPUT
-          echo "imageFilename=constellation-${imageVersion//./-}.tar.gz" >> $GITHUB_OUTPUT
           echo "imageFamily=constellation" >> $GITHUB_OUTPUT
-        elif [[ "${imageType}" = "debug" && ( "${ref}" = "-" || "${ref}" = "main" ) ]]
-        then
-          echo "imageName=constellation-${ref}-${stream}-${timestamp}" >> $GITHUB_OUTPUT
-          echo "imageFilename=constellation-${ref}-${stream}-${timestamp}.tar.gz" >> $GITHUB_OUTPUT
-          echo "imageFamily=constellation-debug-${semver//./-}" >> $GITHUB_OUTPUT
         else
-          echo "imageName=constellation-${ref}-${stream}-${timestamp}" >> $GITHUB_OUTPUT
-          echo "imageFilename=constellation-${ref}-${stream}-${timestamp}.tar.gz" >> $GITHUB_OUTPUT
-          echo "imageFamily=constellation-${ref}" >> $GITHUB_OUTPUT
+          echo "imageFamily=constellation-${ref::45}" >> $GITHUB_OUTPUT
         fi
 
     - name: Configure QEMU input variables
diff --git a/.github/workflows/build-os-image.yml b/.github/workflows/build-os-image.yml
index dea6f19f4..4314bdd33 100644
--- a/.github/workflows/build-os-image.yml
+++ b/.github/workflows/build-os-image.yml
@@ -720,13 +720,13 @@ jobs:
             "lookup-table.json" \
             "s3://cdn-constellation-backend/${{ needs.build-settings.outputs.imageApiBasePath }}/info.json" \
             --no-progress
-          (
+          {
             echo -e "Image version ([Lookup table](https://cdn.confidential.cloud/${{ needs.build-settings.outputs.imageApiBasePath }}/info.json)):"
             echo
             echo -e "\`\`\`"
             echo "${{ needs.build-settings.outputs.imageNameShort }}"
             echo -e "\`\`\`"
-          ) >> "$GITHUB_STEP_SUMMARY"
+          } >> "$GITHUB_STEP_SUMMARY"
 
   add-version-to-versionsapi:
     needs: [upload-image-lookup-table, build-settings]