diff --git a/src/AIFotoONLUS.Core/AIFotoONLUS.Core.csproj b/src/AIFotoONLUS.Core/AIFotoONLUS.Core.csproj
index 9f39d5d..99a3eeb 100644
--- a/src/AIFotoONLUS.Core/AIFotoONLUS.Core.csproj
+++ b/src/AIFotoONLUS.Core/AIFotoONLUS.Core.csproj
@@ -13,7 +13,9 @@
     <RepositoryUrl>https://gitlab.com/MaddoScientisto/aifotoonlus</RepositoryUrl>
     <!-- Use GitVersion MSBuild properties to set package version during CI/build. Provide fallback if variable is not defined.
          Sanitize the GitVersion output to remove characters invalid for NuGet (e.g., braces) -->
-    <GitVersionRaw>$(GitVersion_NuGetVersionV2)</GitVersionRaw>
+    <!-- Prefer composing a safe version from concrete GitVersion MSBuild properties when available -->
+    <GitVersionRaw Condition="'$(GitVersion_MajorMinorPatch)' != ''">$(GitVersion_MajorMinorPatch)-$(GitVersion_EscapedBranchName).$(GitVersion_PreReleaseNumber)</GitVersionRaw>
+    <GitVersionRaw Condition="'$(GitVersionRaw)' == ''">$(GitVersion_NuGetVersionV2)</GitVersionRaw>
     <GitVersionSanitized>$([System.Text.RegularExpressions.Regex]::Replace('$(GitVersionRaw)','[{}]',''))</GitVersionSanitized>
     <Version Condition="'$(GitVersionSanitized)' != ''">$(GitVersionSanitized)</Version>
     <Version Condition="'$(GitVersionSanitized)' == ''">0.1.0</Version>