diff --git a/.github/workflows/dotnet-linux-client.yml b/.github/workflows/dotnet-linux-client.yml
index 7746956..c29f550 100644
--- a/.github/workflows/dotnet-linux-client.yml
+++ b/.github/workflows/dotnet-linux-client.yml
@@ -42,3 +42,10 @@ jobs:
       - name: Test
         run:  |
           dotnet test ./src/CSharp/EasyMicroservices.IdentityMicroservice.Client.sln --no-build --verbosity normal -f net7.0
+
+      - name: Cleanup
+        if: always() 
+        run:          echo "Shutting down Authentication Service with PID $AUTH_PID"
+          kill $AUTH_PID echo "Authentication Service shutdown failed"
+          echo "Shutting down WhiteLabel Service with PID $WHITELABEL_PID"
+          kill $WHITELABEL_PID echo "WhiteLabel Service shutdown failed"
\ No newline at end of file
diff --git a/.github/workflows/dotnet-linux.yml b/.github/workflows/dotnet-linux.yml
index db3affe..f396974 100644
--- a/.github/workflows/dotnet-linux.yml
+++ b/.github/workflows/dotnet-linux.yml
@@ -42,3 +42,10 @@ jobs:
       - name: Test
         run:  |
           dotnet test ./src/CSharp/EasyMicroservices.IdentityMicroservice.sln --no-build --verbosity normal -f net7.0
+
+      - name: Cleanup
+        if: always() 
+        run:          echo "Shutting down Authentication Service with PID $AUTH_PID"
+          kill $AUTH_PID echo "Authentication Service shutdown failed"
+          echo "Shutting down WhiteLabel Service with PID $WHITELABEL_PID"
+          kill $WHITELABEL_PID echo "WhiteLabel Service shutdown failed"
\ No newline at end of file
diff --git a/.github/workflows/dotnet-macos-client.yml b/.github/workflows/dotnet-macos-client.yml
index 475f8ea..11e1d52 100644
--- a/.github/workflows/dotnet-macos-client.yml
+++ b/.github/workflows/dotnet-macos-client.yml
@@ -42,3 +42,10 @@ jobs:
       - name: Test
         run:  |
           dotnet test ./src/CSharp/EasyMicroservices.IdentityMicroservice.Client.sln --no-build --verbosity normal -f net7.0
+
+      - name: Cleanup
+        if: always() 
+        run:          echo "Shutting down Authentication Service with PID $AUTH_PID"
+          kill $AUTH_PID echo "Authentication Service shutdown failed"
+          echo "Shutting down WhiteLabel Service with PID $WHITELABEL_PID"
+          kill $WHITELABEL_PID echo "WhiteLabel Service shutdown failed"
\ No newline at end of file
diff --git a/.github/workflows/dotnet-macos.yml b/.github/workflows/dotnet-macos.yml
index 9e1870e..8611c7a 100644
--- a/.github/workflows/dotnet-macos.yml
+++ b/.github/workflows/dotnet-macos.yml
@@ -42,3 +42,10 @@ jobs:
       - name: Test
         run:  |
           dotnet test ./src/CSharp/EasyMicroservices.IdentityMicroservice.sln --no-build --verbosity normal -f net7.0
+
+      - name: Cleanup
+        if: always() 
+        run:          echo "Shutting down Authentication Service with PID $AUTH_PID"
+          kill $AUTH_PID echo "Authentication Service shutdown failed"
+          echo "Shutting down WhiteLabel Service with PID $WHITELABEL_PID"
+          kill $WHITELABEL_PID echo "WhiteLabel Service shutdown failed"
\ No newline at end of file
diff --git a/.github/workflows/dotnet-windows-client.yml b/.github/workflows/dotnet-windows-client.yml
index 192149b..b48cbbf 100644
--- a/.github/workflows/dotnet-windows-client.yml
+++ b/.github/workflows/dotnet-windows-client.yml
@@ -41,3 +41,10 @@ jobs:
         run: dotnet build ./src/CSharp/EasyMicroservices.IdentityMicroservice.Client.sln --no-restore
       - name: Test
         run: dotnet test ./src/CSharp/EasyMicroservices.IdentityMicroservice.Client.sln --no-build --verbosity normal
+
+      - name: Cleanup
+        if: always() 
+        run:          echo "Shutting down Authentication Service with PID $AUTH_PID"
+          kill $AUTH_PID echo "Authentication Service shutdown failed"
+          echo "Shutting down WhiteLabel Service with PID $WHITELABEL_PID"
+          kill $WHITELABEL_PID echo "WhiteLabel Service shutdown failed"
\ No newline at end of file
diff --git a/.github/workflows/nuget-push-public-client.yml b/.github/workflows/nuget-push-public-client.yml
index c85390e..726239d 100644
--- a/.github/workflows/nuget-push-public-client.yml
+++ b/.github/workflows/nuget-push-public-client.yml
@@ -39,4 +39,10 @@ jobs:
       - name: Create the package
         run: dotnet pack ./src/CSharp/EasyMicroservices.IdentityMicroservice.Client.sln --output nupkgs
       - name: Publish the package to NuGet.org
-        run: dotnet nuget push nupkgs\*.nupkg -k ${{secrets.NUGET_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate
\ No newline at end of file
+        run: dotnet nuget push nupkgs\*.nupkg -k ${{secrets.NUGET_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate
+      - name: Cleanup
+        if: always() 
+        run:          echo "Shutting down Authentication Service with PID $AUTH_PID"
+          kill $AUTH_PID echo "Authentication Service shutdown failed"
+          echo "Shutting down WhiteLabel Service with PID $WHITELABEL_PID"
+          kill $WHITELABEL_PID echo "WhiteLabel Service shutdown failed"
\ No newline at end of file
diff --git a/.github/workflows/nuget-push-public.yml b/.github/workflows/nuget-push-public.yml
index 0904c3d..120b4f3 100644
--- a/.github/workflows/nuget-push-public.yml
+++ b/.github/workflows/nuget-push-public.yml
@@ -39,4 +39,10 @@ jobs:
       - name: Create the package
         run: dotnet pack ./src/CSharp/EasyMicroservices.IdentityMicroservice.sln --output nupkgs
       - name: Publish the package to NuGet.org
-        run: dotnet nuget push nupkgs\*.nupkg -k ${{secrets.NUGET_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate
\ No newline at end of file
+        run: dotnet nuget push nupkgs\*.nupkg -k ${{secrets.NUGET_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate
+      - name: Cleanup
+        if: always() 
+        run:          echo "Shutting down Authentication Service with PID $AUTH_PID"
+          kill $AUTH_PID echo "Authentication Service shutdown failed"
+          echo "Shutting down WhiteLabel Service with PID $WHITELABEL_PID"
+          kill $WHITELABEL_PID echo "WhiteLabel Service shutdown failed"
\ No newline at end of file