diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a1dc57d..a74183b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -80,7 +80,7 @@ core-build:
   rules:
     - if: $CI_COMMIT_TAG =~ /^v[0-9.]+/
   script:
-    - dotnet build -c Release --nologo
+    - dotnet build -c Release --nologo src/Cloudflare/Cloudflare.csproj
     - mkdir ./artifacts
     - shopt -s globstar
     - mv ./**/*.nupkg    ./artifacts/ || true
@@ -104,7 +104,7 @@ core-test:
   before_script:
     - dotnet tool install dotnet-reportgenerator-globaltool --tool-path /dotnet-tools
   script:
-    - dotnet test -c Release --nologo /p:CoverletOutputFormat=Cobertura
+    - dotnet test -c Release --nologo /p:CoverletOutputFormat=Cobertura test/Cloudflare.Tests/Cloudflare.Tests.csproj
     - /dotnet-tools/reportgenerator "-reports:${CI_PROJECT_DIR}/**/coverage.cobertura.xml" "-targetdir:/reports" -reportType:TextSummary
     - cat /reports/Summary.txt
   artifacts:
@@ -126,8 +126,7 @@ core-deploy:
   rules:
     - if: $CI_COMMIT_TAG =~ /^v[0-9.]+/
   script:
-    - dotnet nuget push -k $BAGET_APIKEY -s https://nuget.am-wd.de/v3/index.json --skip-duplicate artifacts/*.nupkg || true
-#    - dotnet nuget push -k $NUGET_APIKEY -s https://api.nuget.org/v3/index.json --skip-duplicate artifacts/*.nupkg || true
+    - dotnet nuget push -k $NUGET_APIKEY -s https://api.nuget.org/v3/index.json --skip-duplicate artifacts/*.nupkg || true
 
 
 
@@ -186,5 +185,4 @@ extensions-deploy:
   rules:
     - if: $CI_COMMIT_TAG =~ /^[a-z]+\/v[0-9.]+/
   script:
-    - dotnet nuget push -k $BAGET_APIKEY -s https://nuget.am-wd.de/v3/index.json --skip-duplicate artifacts/*.nupkg || true
-#    - dotnet nuget push -k $NUGET_APIKEY -s https://api.nuget.org/v3/index.json --skip-duplicate artifacts/*.nupkg || true
+    - dotnet nuget push -k $NUGET_APIKEY -s https://api.nuget.org/v3/index.json --skip-duplicate artifacts/*.nupkg || true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7d9fe5..fbfa486 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 _nothing changed yet_
 
-## [v0.1.0], [zones/v0.1.0], [dns/v0.1.0] - 2025-08-04
+## [v0.1.0], [zones/v0.1.0], [dns/v0.1.0] - 2025-08-05
 
 _Initial Release_
 
diff --git a/cloudflare-api.sln b/cloudflare-api.sln
index 04c7eb0..a1ce2c7 100644
--- a/cloudflare-api.sln
+++ b/cloudflare-api.sln
@@ -43,6 +43,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions",
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{B949CF48-2F6B-491F-A0D3-502204D52BA5}"
+	ProjectSection(SolutionItems) = preProject
+		test\Extensions\Directory.Build.props = test\Extensions\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cloudflare", "src\Cloudflare\Cloudflare.csproj", "{710FB8C2-6B49-43C6-9A48-FA9FA2F75833}"
 EndProject
@@ -66,22 +69,22 @@ Global
 		{710FB8C2-6B49-43C6-9A48-FA9FA2F75833}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{710FB8C2-6B49-43C6-9A48-FA9FA2F75833}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{710FB8C2-6B49-43C6-9A48-FA9FA2F75833}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B68AF597-98BA-C7A2-9624-CA306B1BC086}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B68AF597-98BA-C7A2-9624-CA306B1BC086}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B68AF597-98BA-C7A2-9624-CA306B1BC086}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B68AF597-98BA-C7A2-9624-CA306B1BC086}.Release|Any CPU.Build.0 = Release|Any CPU
-		{973EADA5-5977-CD12-3584-BE9A034A6C23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{973EADA5-5977-CD12-3584-BE9A034A6C23}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{973EADA5-5977-CD12-3584-BE9A034A6C23}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{973EADA5-5977-CD12-3584-BE9A034A6C23}.Release|Any CPU.Build.0 = Release|Any CPU
 		{05CEDEA7-5967-6805-4145-82C5E3D7942F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{05CEDEA7-5967-6805-4145-82C5E3D7942F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{05CEDEA7-5967-6805-4145-82C5E3D7942F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{05CEDEA7-5967-6805-4145-82C5E3D7942F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B68AF597-98BA-C7A2-9624-CA306B1BC086}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B68AF597-98BA-C7A2-9624-CA306B1BC086}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B68AF597-98BA-C7A2-9624-CA306B1BC086}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B68AF597-98BA-C7A2-9624-CA306B1BC086}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F9684EAD-B1AA-6410-0577-36758907BF5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F9684EAD-B1AA-6410-0577-36758907BF5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F9684EAD-B1AA-6410-0577-36758907BF5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F9684EAD-B1AA-6410-0577-36758907BF5C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{973EADA5-5977-CD12-3584-BE9A034A6C23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{973EADA5-5977-CD12-3584-BE9A034A6C23}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{973EADA5-5977-CD12-3584-BE9A034A6C23}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{973EADA5-5977-CD12-3584-BE9A034A6C23}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F4F36DA2-A86A-4F88-A270-45CD254433A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F4F36DA2-A86A-4F88-A270-45CD254433A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F4F36DA2-A86A-4F88-A270-45CD254433A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -91,16 +94,16 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{710FB8C2-6B49-43C6-9A48-FA9FA2F75833} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
-		{CC6F1A0E-F7BC-47D0-AB42-0DFC02D0CB46} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
-		{B68AF597-98BA-C7A2-9624-CA306B1BC086} = {CC6F1A0E-F7BC-47D0-AB42-0DFC02D0CB46}
-		{973EADA5-5977-CD12-3584-BE9A034A6C23} = {CC6F1A0E-F7BC-47D0-AB42-0DFC02D0CB46}
-		{05CEDEA7-5967-6805-4145-82C5E3D7942F} = {03EFEF88-1C02-43BD-BAF2-6E3583E176DD}
-		{B949CF48-2F6B-491F-A0D3-502204D52BA5} = {03EFEF88-1C02-43BD-BAF2-6E3583E176DD}
-		{F9684EAD-B1AA-6410-0577-36758907BF5C} = {B949CF48-2F6B-491F-A0D3-502204D52BA5}
-		{B3E7C9D0-6C31-4315-BD12-5C09E779930E} = {F775D5D5-4466-4821-B28B-444828937810}
 		{DB52006F-77DA-41A7-BF1E-E7FADA392216} = {F775D5D5-4466-4821-B28B-444828937810}
 		{95693042-95D1-4653-8CE4-E0CA49671FDD} = {F775D5D5-4466-4821-B28B-444828937810}
+		{B3E7C9D0-6C31-4315-BD12-5C09E779930E} = {F775D5D5-4466-4821-B28B-444828937810}
+		{CC6F1A0E-F7BC-47D0-AB42-0DFC02D0CB46} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{B949CF48-2F6B-491F-A0D3-502204D52BA5} = {03EFEF88-1C02-43BD-BAF2-6E3583E176DD}
+		{710FB8C2-6B49-43C6-9A48-FA9FA2F75833} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{05CEDEA7-5967-6805-4145-82C5E3D7942F} = {03EFEF88-1C02-43BD-BAF2-6E3583E176DD}
+		{B68AF597-98BA-C7A2-9624-CA306B1BC086} = {CC6F1A0E-F7BC-47D0-AB42-0DFC02D0CB46}
+		{F9684EAD-B1AA-6410-0577-36758907BF5C} = {B949CF48-2F6B-491F-A0D3-502204D52BA5}
+		{973EADA5-5977-CD12-3584-BE9A034A6C23} = {CC6F1A0E-F7BC-47D0-AB42-0DFC02D0CB46}
 		{F4F36DA2-A86A-4F88-A270-45CD254433A6} = {B949CF48-2F6B-491F-A0D3-502204D52BA5}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/src/Cloudflare/Cloudflare.csproj b/src/Cloudflare/Cloudflare.csproj
index 718c39f..79e6837 100644
--- a/src/Cloudflare/Cloudflare.csproj
+++ b/src/Cloudflare/Cloudflare.csproj
@@ -12,6 +12,8 @@
 
     <Product>Cloudflare API - Core</Product>
     <Description>Core features of the Cloudflare API</Description>
+
+    <AssemblyOriginatorKeyFile>../../cloudflare-api.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <!-- Only build package for tagged releases or Debug on CI (only dev NuGet feed) -->
@@ -19,4 +21,10 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="../../package-icon.png" Pack="true" PackagePath="/" />
+    <None Include="../../LICENSE.txt" Pack="true" PackagePath="/" />
+    <None Include="README.md" Pack="true" PackagePath="/" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 080e6e8..302f2dc 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -38,12 +38,6 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <None Include="$(SolutionDir)/package-icon.png" Pack="true" PackagePath="/" />
-    <None Include="$(SolutionDir)/LICENSE.txt" Pack="true" PackagePath="/" />
-    <None Include="README.md" Pack="true" PackagePath="/" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="AMWD.NetRevisionTask" Version="1.3.0">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/Extensions/Cloudflare.Dns/Cloudflare.Dns.csproj b/src/Extensions/Cloudflare.Dns/Cloudflare.Dns.csproj
index 2a06539..efd85b3 100644
--- a/src/Extensions/Cloudflare.Dns/Cloudflare.Dns.csproj
+++ b/src/Extensions/Cloudflare.Dns/Cloudflare.Dns.csproj
@@ -15,8 +15,7 @@
   </PropertyGroup>
 
   <!-- Only build package for tagged releases or Debug on CI (only dev NuGet feed) -->
-  <!--<PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(CI_COMMIT_TAG)', '^dns\/v[0-9.]+')) or ('$(Configuration)' == 'Debug' and '$(GITLAB_CI)' == 'true')">-->
-  <PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(CI_COMMIT_TAG)', '^dns\/v[0-9.]+')) or '$(Configuration)' == 'Debug'">
+  <PropertyGroup Condition="$([System.Text.RegularExpressions.Regex]::IsMatch('$(CI_COMMIT_TAG)', '^dns\/v[0-9.]+')) or ('$(Configuration)' == 'Debug' and '$(GITLAB_CI)' == 'true')">
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
diff --git a/src/Extensions/Directory.Build.props b/src/Extensions/Directory.Build.props
index 90a224f..4a237e0 100644
--- a/src/Extensions/Directory.Build.props
+++ b/src/Extensions/Directory.Build.props
@@ -1,10 +1,20 @@
 <Project>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../../cloudflare-api.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+
   <ItemGroup Condition="'$(Configuration)' == 'Release'">
     <PackageReference Include="AMWD.Net.API.Cloudflare" Version="0.1.0" />
   </ItemGroup>
   
   <ItemGroup Condition="'$(Configuration)' == 'Debug'">
-    <ProjectReference Include="$(SolutionDir)\src\Cloudflare\Cloudflare.csproj" />
+    <ProjectReference Include="../../../src/Cloudflare/Cloudflare.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="../../../package-icon.png" Pack="true" PackagePath="/" />
+    <None Include="../../../LICENSE.txt" Pack="true" PackagePath="/" />
+    <None Include="README.md" Pack="true" PackagePath="/" />
   </ItemGroup>
 
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)\..'))" />
diff --git a/test/Cloudflare.Tests/Cloudflare.Tests.csproj b/test/Cloudflare.Tests/Cloudflare.Tests.csproj
index 5ad8916..5f7cbd1 100644
--- a/test/Cloudflare.Tests/Cloudflare.Tests.csproj
+++ b/test/Cloudflare.Tests/Cloudflare.Tests.csproj
@@ -2,6 +2,12 @@
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
+
+    <AssemblyOriginatorKeyFile>../../cloudflare-api.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="../../src/Cloudflare/Cloudflare.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 83860e1..b0e776c 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -4,6 +4,8 @@
     <IsTestProject>true</IsTestProject>
     <CollectCoverage>true</CollectCoverage>
     <CoverletOutputFormat>Cobertura</CoverletOutputFormat>
+
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,10 +23,6 @@
     <Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="$(SolutionDir)\src\Cloudflare\Cloudflare.csproj" />
-  </ItemGroup>
-
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)\..'))" />
 </Project>
 
diff --git a/test/Extensions/Directory.Build.props b/test/Extensions/Directory.Build.props
new file mode 100644
index 0000000..2347a9e
--- /dev/null
+++ b/test/Extensions/Directory.Build.props
@@ -0,0 +1,12 @@
+<Project>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>../../../cloudflare-api.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <ProjectReference Include="../../../src/Cloudflare/Cloudflare.csproj" />
+  </ItemGroup>
+
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)\..'))" />
+</Project>
+