diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml
new file mode 100644
index 0000000..a223bad
--- /dev/null
+++ b/.github/workflows/nuget.yml
@@ -0,0 +1,29 @@
+name: Release NuGet Package
+on:
+  release:
+    types: [published] # Triggers when you create a GitHub Release
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write # Required for OIDC
+      contents: read
+    steps:
+    - uses: actions/checkout@v4
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 10.0.x
+    - name: Restore dependencies
+      run:  dotnet restore
+    - name: Build
+      run:  dotnet build -c Release -p:Version=${GITHUB_REF_NAME#v} --no-restore
+    - name: Run Tests
+      run:  dotnet test -c Release --report-trx --results-directory=".artifacts/test-results" --no-build --no-restore
+    - name: Pack Nuget
+      run:  dotnet pack -c Release -p:Version=${GITHUB_REF_NAME#v} -o .artifacts/packages --no-build --no-restore
+    - name: Authenticate with NuGet via OIDC
+      uses: NuGet/login@v1
+      id:   nuget-login
+    - name: Push Nuget
+      run:  dotnet nuget push ".artifacts/packages/**/*.nupkg" -s https://api.nuget.org/v3/index.json -k ${{ steps.nuget-login.outputs.NUGET_API_KEY }} --skip-duplicate
\ No newline at end of file
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 7c587a6..d675593 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -1,36 +1,25 @@
-name: .NET
-
-# Trigger build and test whenever a pull request is opened or updated against target branches
+name: PR Workflow
 on:
   pull_request:
-    branches: [ "master" ]
-
+    branches: [ "master" ] # Triggers when you create a PR targeting a master branch
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
-
     - uses: actions/checkout@v4
-
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: 10.0.x
-
     - name: Restore dependencies
-      run: dotnet restore
-
+      run:  dotnet restore
     - name: Build
-      run: dotnet build --no-restore
-
-    - name: Test
-      run:  dotnet test --report-trx --results-directory=".artifacts/test-results" || true
-
-    - name: Test Report
+      run:  dotnet build --no-restore
+    - name: Run Tests
+      run:  dotnet test --report-trx --results-directory=".artifacts/test-results" --no-build --no-restore || true
+    - name: Publish Test Report
       uses: dorny/test-reporter@v1
-      if: always()
+      if:   always()
       with:
         name: .NET Core Tests
         path: ".artifacts/test-results/**/*.trx"
diff --git a/Directory.Build.props b/Directory.Build.props
index ed7f581..305088b 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,9 +1,5 @@
 <Project>
 
-	<PropertyGroup>
-		<ServiceErrorsVersion>0.0.1</ServiceErrorsVersion>
-	</PropertyGroup>
-
 	<PropertyGroup>
 		<UseArtifactsOutput>true</UseArtifactsOutput>
 		<ArtifactsPath>$(MSBuildThisFileDirectory).artifacts/</ArtifactsPath>
@@ -15,6 +11,11 @@
 		<IsPackable>false</IsPackable>
 	</PropertyGroup>
 
+	<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
+		<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+		<EmbedUntrackedSources>true</EmbedUntrackedSources>
+	</PropertyGroup>
+
 	<PropertyGroup>
 		<IsSrcProject>false</IsSrcProject>
 		<IsSrcProject Condition="$([System.String]::new('$(MSBuildProjectDirectory)').ToLower().Contains('\src\'))">true</IsSrcProject>
@@ -23,8 +24,9 @@
 
 	<PropertyGroup>
 		<IsTestProject>false</IsTestProject>
-		<IsTestProject Condition="$([System.String]::Copy('$(MSBuildProjectName)').EndsWith('.UnitTests'))">true</IsTestProject>
-		<TestProjectBaseName Condition="'$(IsTestProject)' == 'true'">$([System.String]::Copy('$(MSBuildProjectName)').Replace('.UnitTests',''))</TestProjectBaseName>
+		<IsTestProject Condition="$([System.String]::new('$(MSBuildProjectDirectory)').ToLower().Contains('\tests\'))">true</IsTestProject>
+		<IsTestProject Condition="$([System.String]::new('$(MSBuildProjectDirectory)').ToLower().Contains('/tests/'))">true</IsTestProject>
+		<TestProjectBaseName Condition="'$(IsTestProject)' == 'true'">$([System.String]::Copy('$(MSBuildProjectName)').Replace('.UnitTests','').Replace('.IntegrationTests','').Replace('.Tests',''))</TestProjectBaseName>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(IsSrcProject)' == 'true'">
@@ -32,13 +34,17 @@
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<Authors>Igor Sinicyn</Authors>
 		<Company>CodeMe</Company>
+		<Product>CodeMe</Product>
 		<PackageProjectUrl>https://github.com/ig-sinicyn/CodeMe</PackageProjectUrl>
-		<RepositoryUrl>https://github.com/ig-sinicyn/CodeMe.git</RepositoryUrl>
-		<RepositoryType>git</RepositoryType>
+		<PublishRepositoryUrl>true</PublishRepositoryUrl>
+		<IncludeSymbols>true</IncludeSymbols>
+		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 	</PropertyGroup>
 
 	<ItemGroup Condition="'$(IsSrcProject)' == 'true'">
+		<InternalsVisibleTo Include="$(MSBuildProjectName).Tests" />
 		<InternalsVisibleTo Include="$(MSBuildProjectName).UnitTests" />
+		<InternalsVisibleTo Include="$(MSBuildProjectName).IntegrationTests" />
 	</ItemGroup>
 
 	<PropertyGroup Condition="'$(IsTestProject)' == 'true'">
@@ -51,7 +57,7 @@
 		<PackageReference Include="AwesomeAssertions" />
 		<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" />
 		<PackageReference Include="xunit.v3.mtp-v2" />
-		<ProjectReference Include="..\..\src\$(TestProjectBaseName)\$(TestProjectBaseName).csproj" />
+		<ProjectReference Include="../../src/$(TestProjectBaseName)/$(TestProjectBaseName).csproj" />
 		<Using Include="AwesomeAssertions" />
 		<Using Include="Xunit" />
 	</ItemGroup>
diff --git a/cicd/cicd.csproj b/cicd/cicd.csproj
index 6d2708d..3cd1421 100644
--- a/cicd/cicd.csproj
+++ b/cicd/cicd.csproj
@@ -5,8 +5,8 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<None Include="..\.github\**\*.*">
-			<Link>.github\%(RecursiveDir)%(Filename)%(Extension)</Link>
+		<None Include="../.github/**/*.*">
+			<Link>.github/%(RecursiveDir)%(Filename)%(Extension)</Link>
 		</None>
 	</ItemGroup>
 
diff --git a/env/env.csproj b/env/env.csproj
index 7d5c0d3..970527f 100644
--- a/env/env.csproj
+++ b/env/env.csproj
@@ -5,10 +5,10 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<None Include="..\*.*">
+		<None Include="../*.*">
 			<Link>%(Filename)%(Extension)</Link>
 		</None>
-		<None Remove="..\*.slnx"/>
+		<None Remove="../*.slnx"/>
 	</ItemGroup>
 
 </Project>
diff --git a/src/CodeMe.ServiceErrors.Abstractions/CodeMe.ServiceErrors.Abstractions.csproj b/src/CodeMe.ServiceErrors.Abstractions/CodeMe.ServiceErrors.Abstractions.csproj
index 4b236ec..9199871 100644
--- a/src/CodeMe.ServiceErrors.Abstractions/CodeMe.ServiceErrors.Abstractions.csproj
+++ b/src/CodeMe.ServiceErrors.Abstractions/CodeMe.ServiceErrors.Abstractions.csproj
@@ -6,7 +6,7 @@
 		<LangVersion>latest</LangVersion>
 
 		<Description>Library for typed service errors (Problem Details-alike DTOs)</Description>
-		<PackageTags>errors;typed_errors</PackageTags>
+		<PackageTags>errors;typed errors</PackageTags>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/src/CodeMe.ServiceErrors/CodeMe.ServiceErrors.csproj b/src/CodeMe.ServiceErrors/CodeMe.ServiceErrors.csproj
index 10f4439..ba53439 100644
--- a/src/CodeMe.ServiceErrors/CodeMe.ServiceErrors.csproj
+++ b/src/CodeMe.ServiceErrors/CodeMe.ServiceErrors.csproj
@@ -4,7 +4,7 @@
 		<TargetFramework>net10.0</TargetFramework>
 
 		<Description>Library for typed service errors (Problem Details-alike DTOs)</Description>
-		<PackageTags>errors;typed_errors</PackageTags>
+		<PackageTags>errors;typed errors</PackageTags>
 
 		<!-- NuGet Package Properties -->
 		<PackageReadmeFile>README.md</PackageReadmeFile>
@@ -15,11 +15,11 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<ProjectReference Include="..\CodeMe.ServiceErrors.Abstractions\CodeMe.ServiceErrors.Abstractions.csproj" />
+		<ProjectReference Include="../CodeMe.ServiceErrors.Abstractions/CodeMe.ServiceErrors.Abstractions.csproj" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<None Include="README.md" Pack="true" PackagePath="\" />
+		<None Include="README.md" Pack="true" PackagePath="/" />
 	</ItemGroup>
 
 </Project>
\ No newline at end of file