diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 55d7b58..f271fb8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -51,11 +51,17 @@ jobs:
       - name: "Dotnet Cake Pack"
         run: dotnet cake --target=Pack
 
-      - name: 'Publish Artifacts'
+      - name: 'Publish Test Result Artifacts'
         uses: actions/upload-artifact@v3
         with:
-          name: ubuntu-latest
-          path: './Artifacts/*'
+          name: test-results
+          path: './Artifacts/TestResults/**/*'
+
+      - name: 'Publish Package Artifacts'
+        uses: actions/upload-artifact@v3
+        with:
+          name: packages
+          path: './Artifacts/Packages/*'
 
   publish-test-results:
     name: "Publish Tests Results"
@@ -66,10 +72,13 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - name: "Download Artifact"
+      - name: "Download Test Result Artifacts"
         uses: actions/download-artifact@v3.0.2
         with:
+          name: test-results
           path: "./Artifacts"
+      - name: "Hmm"
+        run: find . -name .git -prune -o -name bin -prune -o -name obj -prune -o -name .vs -prune -o -name .vscode -prune -o -name .devcontainer -prune -o -name _ReSharper.Caches -prune -o -name .scripts -prune -o -name .nuget -prune -o -name .github -prune -o -type f -print
       - name: "Publish Test Summary"
         uses: test-summary/action@v2
         if: always()
@@ -90,12 +99,13 @@ jobs:
       - name: "Download Artifact"
         uses: actions/download-artifact@v3.0.2
         with:
-          name: "ubuntu-latest"
+          name: "packages"
+          path: "./Artifacts"
       - name: "Dotnet NuGet Add Source"
         run: dotnet nuget add source https://nuget.pkg.github.com/scottt732/index.json --name GitHub --username 'scottt732' --password '${{secrets.GITHUB_TOKEN}}' --store-password-in-clear-text
         shell: pwsh
       - name: "Hmm"
-        run: find . -name .git -prune -o -name bin -prune -o -name obj -prune -o -name .vs -prune -o -name .vscode -prune -o -name .devcontainer -prune -o -name _ReSharper.Caches -prune -o -name .scripts -prune -o -name .nuget -prune -o -name .github -prune -o -type d -print
+        run: find . -name .git -prune -o -name bin -prune -o -name obj -prune -o -name .vs -prune -o -name .vscode -prune -o -name .devcontainer -prune -o -name _ReSharper.Caches -prune -o -name .scripts -prune -o -name .nuget -prune -o -name .github -prune -o -type f -print
       - name: "Dotnet NuGet Push Libraries"
         run: dotnet nuget push ${{ github.workspace }}/Artifacts/*.nupkg --api-key '${{ github.token }}' --source GitHub --skip-duplicate
         shell: pwsh
diff --git a/Source/Sholo.Mqtt/VERSION b/Source/Sholo.Mqtt/VERSION
index 7826879..03a64fa 100644
--- a/Source/Sholo.Mqtt/VERSION
+++ b/Source/Sholo.Mqtt/VERSION
@@ -1 +1 @@
-0.2.1-alpha.18
+0.2.1-alpha.21
diff --git a/build.cake b/build.cake
index a7bec64..045604a 100644
--- a/build.cake
+++ b/build.cake
@@ -5,12 +5,16 @@ var configuration =
     "Release";
 
 var artifactsDirectory = Directory("./Artifacts");
+var testResultArtifactsDirectory = Directory("./Artifacts/TestResults");
+var packageArtifactsDirectory = Directory("./Artifacts/Packages");
 
 Task("Clean")
     .Description("Cleans the artifacts, bin and obj directories.")
     .Does(() =>
     {
         CleanDirectory(artifactsDirectory);
+        CleanDirectory(testResultArtifactsDirectory);
+        CleanDirectory(packageArtifactsDirectory);
         DeleteDirectories(GetDirectories("**/bin"), new DeleteDirectorySettings() { Force = true, Recursive = true });
         DeleteDirectories(GetDirectories("**/obj"), new DeleteDirectorySettings() { Force = true, Recursive = true });
     });
@@ -56,7 +60,7 @@ Task("Test")
                 },
                 NoBuild = true,
                 NoRestore = true,
-                ResultsDirectory = artifactsDirectory,
+                ResultsDirectory = testResultArtifactsDirectory,
                 ArgumentCustomization = x => x.Append("--blame"),
             });
     });
@@ -74,7 +78,7 @@ Task("Pack")
                 MSBuildSettings = new DotNetMSBuildSettings().WithProperty("SymbolPackageFormat", "snupkg"),
                 NoBuild = true,
                 NoRestore = true,
-                OutputDirectory = artifactsDirectory,
+                OutputDirectory = packageArtifactsDirectory,
             });
     });