diff --git a/.github/workflows/release-nightly-ota.yml b/.github/workflows/release-nightly-ota.yml
index fd2f1a74d3..aff8e7c191 100644
--- a/.github/workflows/release-nightly-ota.yml
+++ b/.github/workflows/release-nightly-ota.yml
@@ -65,11 +65,13 @@ jobs:
           $ids = $($described -split "-")
           if ($ids.length -eq 3) {
             $ver = "v$(semver --increment $ids[0].Substring(1))"
-            echo "tag=$ver-alpha.0.$($ids[1]).$($ids[2])" >> $env:GITHUB_OUTPUT
+            $dist = `printf "%05d"` $ids[1]
+            echo "tag=$ver-alpha.1.$($dist).$($ids[2])" >> $env:GITHUB_OUTPUT
             exit 0
           }
           if ($ids.length -eq 4) {
-            echo "tag=$($ids[0])-$($ids[1]).$($ids[2]).$($ids[3])" >> $env:GITHUB_OUTPUT
+            $dist = `printf "%05d"` $ids[2]
+            echo "tag=$($ids[0])-$($ids[1]).$($dist).$($ids[3])" >> $env:GITHUB_OUTPUT
             exit 0
           }
           exit 1