diff --git a/.github/workflows/CreateSignNuGet.yml b/.github/workflows/CreateSignNuGet.yml
index 5c58519..1dc7b55 100644
--- a/.github/workflows/CreateSignNuGet.yml
+++ b/.github/workflows/CreateSignNuGet.yml
@@ -16,8 +16,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       
-      - name: Create NuGet Package
-        run: dotnet pack ./working
+      - name: Create NuGet Package (Branch)
+        if: github.ref_type != 'tag'
+        run: dotnet pack ./working --version-suffix "ci-${{ github.run_number }}" -c Release
+      
+      - name: Create NuGet Package (Tag)
+        if: github.ref_type == 'tag'
+        run: dotnet pack ./working -p:PackageVersion=${{ github.ref_name }} -c Release
          
       - name: Find created nuget
         id: findcreatednuget        
diff --git a/working/templatepack.csproj b/working/templatepack.csproj
index 691f379..4160716 100644
--- a/working/templatepack.csproj
+++ b/working/templatepack.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PackageType>template</PackageType>
-    <PackageVersion>1.0.17</PackageVersion>
+    <Version Condition="'$(Configuration)' == 'Debug'">1.0.0</Version> 
     <PackageId>Skyline.DataMiner.VisualStudioTemplates</PackageId>
     <Title>DataMiner DotNet Templates</Title>
     <Authors>SkylineCommunications</Authors>