diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 04b9aee9..c07f369e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -200,10 +200,9 @@ jobs:
           --api-key ${{ secrets.GITHUB_TOKEN }}
 
       # Only publish to NuGet on stable releases
-      # Repeat the run for these inputs: Fido2, Fido2.Models, Fido2.Aspnet
-      - name: Publish package to NuGet Registry
+      - name: Publish packages (NuGet Registry)
         if: ${{ github.event_name == 'release' }}
-        run: |
-          dotnet nuget push **/Fido2.nupkg --source "https://api.nuget.org/v3/index.json" --api-key "${{ secrets.nuget_api_key }}"
-          dotnet nuget push **/Fido2.Models.nupkg --source "https://api.nuget.org/v3/index.json" --api-key "${{ secrets.nuget_api_key }}"
-          dotnet nuget push **/Fido2.AspNet.nupkg --source "https://api.nuget.org/v3/index.json" --api-key "${{ secrets.nuget_api_key }}"
+        run: >
+          dotnet nuget push **/*.nupkg
+          --source https://api.nuget.org/v3/index.json
+          --api-key ${{ secrets.nuget_api_key }}
diff --git a/Directory.Build.props b/Directory.Build.props
index a0a197bd..db1b40c7 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -29,6 +29,7 @@
   <PropertyGroup>
     <!-- Avoid annoying build warnings when packing using the solution file -->
     <IsPackable>false</IsPackable>
+    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <!-- Avoid annoying build warnings when packing using the solution file -->
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
diff --git a/Src/Directory.Build.props b/Src/Directory.Build.props
index 00c23c19..1520c7df 100644
--- a/Src/Directory.Build.props
+++ b/Src/Directory.Build.props
@@ -9,11 +9,5 @@
   </PropertyGroup>
   <ItemGroup Condition="$(IS_DOCKER) == ''">
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-  </ItemGroup>
-
-  <!-- Projects inside "./src" should generate packages -->
-  <PropertyGroup>
-    <IsPackable>true</IsPackable>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-  </PropertyGroup>
+  </ItemGroup>  
 </Project>
\ No newline at end of file
diff --git a/Src/Fido2.AspNet/Fido2.AspNet.csproj b/Src/Fido2.AspNet/Fido2.AspNet.csproj
index 7721adf8..3f1af908 100644
--- a/Src/Fido2.AspNet/Fido2.AspNet.csproj
+++ b/Src/Fido2.AspNet/Fido2.AspNet.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <TargetFrameworks>$(SupportedTargetFrameworks)</TargetFrameworks>
     <RootNamespace>Fido2NetLib</RootNamespace>
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Src/Fido2.Models/Fido2.Models.csproj b/Src/Fido2.Models/Fido2.Models.csproj
index fe9c0304..b4a6a025 100644
--- a/Src/Fido2.Models/Fido2.Models.csproj
+++ b/Src/Fido2.Models/Fido2.Models.csproj
@@ -6,6 +6,7 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsTrimmable>true</IsTrimmable>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
 
 </Project>
diff --git a/Src/Fido2/Fido2.csproj b/Src/Fido2/Fido2.csproj
index 026cb86d..cbe7d1db 100644
--- a/Src/Fido2/Fido2.csproj
+++ b/Src/Fido2/Fido2.csproj
@@ -7,6 +7,7 @@
     <ImplicitUsings>disable</ImplicitUsings>
     <IsTrimmable>true</IsTrimmable>
     <NoWarn>$(NoWarn);IDE0057</NoWarn>
+    <IsPackable>true</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Test/Test.csproj b/Test/Test.csproj
index 32cd7380..4aea3295 100644
--- a/Test/Test.csproj
+++ b/Test/Test.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>$(SupportedTargetFrameworks)</TargetFrameworks>
-    <IsPackable>false</IsPackable>
     <NoWarn>$(NoWarm);CA1822;IDE0007;IDE0037;IDE0039;IDE0057;CA1825</NoWarn>
   </PropertyGroup>
 
diff --git a/Tests/Fido2.Ctap2.Tests/Fido2.Ctap2.Tests.csproj b/Tests/Fido2.Ctap2.Tests/Fido2.Ctap2.Tests.csproj
index 8d3c5295..f4e640ad 100644
--- a/Tests/Fido2.Ctap2.Tests/Fido2.Ctap2.Tests.csproj
+++ b/Tests/Fido2.Ctap2.Tests/Fido2.Ctap2.Tests.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>$(SupportedTargetFrameworks)</TargetFrameworks>
     <Nullable>enable</Nullable>
-    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>