diff --git a/set-version/action.yaml b/set-version/action.yaml
index c068c62..a4f5d36 100644
--- a/set-version/action.yaml
+++ b/set-version/action.yaml
@@ -28,21 +28,14 @@ runs:
       id: calculate
       shell: bash
       run: |
-        # Regular date with leading zeros
         DATE_LEADING=$(date +'%Y.%m.%d')
 
-        # Year, month and day without leading zeros for alternate formats
         YEAR=$(date +'%Y')
         MONTH_NL=$(date +%-m)
         DAY_NL=$(date +%-d)
 
         TAG_COUNT=$(git tag -l "${DATE_LEADING}.*" | wc -l)
-
-        if [ "${TAG_COUNT}" -eq 0 ]; then
-          BUILD_NUMBER=0
-        else
-          BUILD_NUMBER=$((${TAG_COUNT} + 1))
-        fi
+        BUILD_NUMBER="${TAG_COUNT}"  # 0 on first build, 1 on second, etc.
 
         VERSION_SUFFIX="${{ inputs.version_suffix }}"
         SUFFIX_SEPARATOR="${{ inputs.suffix_separator }}"
@@ -54,7 +47,7 @@ runs:
           BUILD_VERSION="${DATE_LEADING}.${BUILD_NUMBER}"
         fi
 
-        # Dotnet variant: year.month.day[.build][-suffix] (no leading zeros for month/day)
+        # Dotnet variant: no leading zeros for month/day, omit build segment when 0
         DOTNET_DATE="${YEAR}.${MONTH_NL}.${DAY_NL}"
         if [ "${BUILD_NUMBER}" -eq 0 ]; then
           if [ -n "$VERSION_SUFFIX" ]; then
@@ -70,25 +63,23 @@ runs:
           fi
         fi
 
-        # NPM variant: year.month.(day concatenated with build) e.g. 2026.2.221 for day=22 build=1
-        NPM_DAY_BUILD="${DAY_NL}${BUILD_NUMBER}"
+        # NPM variant: year.month.(DDbb) where DD=day zero-padded to 2, bb=build zero-padded to 2
+        DAY_PAD=$(printf '%02d' "${DAY_NL}")
+        BUILD_PAD=$(printf '%02d' "${BUILD_NUMBER}")
+        NPM_DAY_BUILD="${DAY_PAD}${BUILD_PAD}"
         if [ -n "$VERSION_SUFFIX" ]; then
           NPM_VERSION="${YEAR}.${MONTH_NL}.${NPM_DAY_BUILD}${SUFFIX_SEPARATOR}${VERSION_SUFFIX}"
         else
           NPM_VERSION="${YEAR}.${MONTH_NL}.${NPM_DAY_BUILD}"
         fi
 
-        # Write the versions as artifacts (plain and .txt) for accessibility
         echo "$BUILD_VERSION" > version.txt
         echo "$BUILD_VERSION" > version
-
         echo "$DOTNET_VERSION" > dotnet-version.txt
         echo "$DOTNET_VERSION" > dotnet-version
-
         echo "$NPM_VERSION" > npm-version.txt
         echo "$NPM_VERSION" > npm-version
 
-        # Export versions to environment
         echo "VERSION=$BUILD_VERSION" >> $GITHUB_ENV
         echo "DOTNET_VERSION=$DOTNET_VERSION" >> $GITHUB_ENV
         echo "NPM_VERSION=$NPM_VERSION" >> $GITHUB_ENV