diff --git a/.github/workflows/on-tag-only.yml b/.github/workflows/on-tag-only.yml
index 4308711..8d9a8c7 100644
--- a/.github/workflows/on-tag-only.yml
+++ b/.github/workflows/on-tag-only.yml
@@ -40,13 +40,15 @@ jobs:
         
         - name: Set image name
           run: |
-                IMAGE_NAME="umbrel-os-$(git describe --tags)"
+                UMBREL_OS_VERSION="$(git describe --tags)"
+                IMAGE_NAME="umbrel-os-${UMBREL_OS_VERSION}"
+                echo "::set-env name=UMBREL_OS_VERSION::$UMBREL_OS_VERSION"
                 echo "::set-env name=IMAGE_NAME::$IMAGE_NAME"
 
         - name: Run build script
           run: |
                 echo "Building $IMAGE_NAME"
-                sudo IMG_FILENAME=$IMAGE_NAME ZIP_FILENAME=$IMAGE_NAME ./build.sh
+                sudo IMG_FILENAME=$IMAGE_NAME ZIP_FILENAME=$IMAGE_NAME UMBREL_OS_VERSION=$UMBREL_OS_VERSION ./build.sh
 
         - name: Copy ZIP to current working dir
           run: cp deploy/*.zip ./