diff --git a/set-version/action.yaml b/set-version/action.yaml
index 9f5be44..c068c62 100644
--- a/set-version/action.yaml
+++ b/set-version/action.yaml
@@ -54,12 +54,20 @@ runs:
           BUILD_VERSION="${DATE_LEADING}.${BUILD_NUMBER}"
         fi
 
-        # Dotnet variant: year.month.day.build (no leading zeros for month/day)
+        # Dotnet variant: year.month.day[.build][-suffix] (no leading zeros for month/day)
         DOTNET_DATE="${YEAR}.${MONTH_NL}.${DAY_NL}"
-        if [ -n "$VERSION_SUFFIX" ]; then
-          DOTNET_VERSION="${DOTNET_DATE}.${BUILD_NUMBER}${SUFFIX_SEPARATOR}${VERSION_SUFFIX}"
+        if [ "${BUILD_NUMBER}" -eq 0 ]; then
+          if [ -n "$VERSION_SUFFIX" ]; then
+            DOTNET_VERSION="${DOTNET_DATE}${SUFFIX_SEPARATOR}${VERSION_SUFFIX}"
+          else
+            DOTNET_VERSION="${DOTNET_DATE}"
+          fi
         else
-          DOTNET_VERSION="${DOTNET_DATE}.${BUILD_NUMBER}"
+          if [ -n "$VERSION_SUFFIX" ]; then
+            DOTNET_VERSION="${DOTNET_DATE}.${BUILD_NUMBER}${SUFFIX_SEPARATOR}${VERSION_SUFFIX}"
+          else
+            DOTNET_VERSION="${DOTNET_DATE}.${BUILD_NUMBER}"
+          fi
         fi
 
         # NPM variant: year.month.(day concatenated with build) e.g. 2026.2.221 for day=22 build=1
@@ -70,13 +78,20 @@ runs:
           NPM_VERSION="${YEAR}.${MONTH_NL}.${NPM_DAY_BUILD}"
         fi
 
-        # Write the versions as artifacts for backward compatibility and accessibility
+        # Write the versions as artifacts (plain and .txt) for accessibility
         echo "$BUILD_VERSION" > version.txt
-        echo "$DOTNET_VERSION" > dotnet-version.txt
-        echo "$NPM_VERSION" > npm-version.txt
+        echo "$BUILD_VERSION" > version
 
-        # Export regular version to environment (backwards-compatible)
+        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
 
     - name: Create Git Tag
       shell: bash