diff --git a/.github/workflows/webapp-build-net-macos.yml b/.github/workflows/webapp-build-net-macos.yml
index 2431db9511..57c01ce3c6 100644
--- a/.github/workflows/webapp-build-net-macos.yml
+++ b/.github/workflows/webapp-build-net-macos.yml
@@ -40,9 +40,9 @@ jobs:
     - name: "BuildNetCore (MacOS)"
       shell: bash
       working-directory: ./starsky
-      run: bash build.sh --Target BuildNetCore --no-sonar --no-publish --no-dependencies --skip --no-logo
+      run: bash build.sh --Target BuildNetCore --no-sonar --no-publish --no-dependencies --no-logo
 
     - name: "TestNetCore (MacOS)"
       shell: bash
       working-directory: ./starsky
-      run: bash build.sh --Target TestNetCore --skip --no-logo --no-publish
+      run: bash build.sh --Target TestNetCore --no-logo --no-publish
diff --git a/.github/workflows/webapp-build-net-ubuntu.yml b/.github/workflows/webapp-build-net-ubuntu.yml
index 7258303811..c94ff32853 100644
--- a/.github/workflows/webapp-build-net-ubuntu.yml
+++ b/.github/workflows/webapp-build-net-ubuntu.yml
@@ -52,12 +52,12 @@ jobs:
     - name: "BuildNetCore (Ubuntu)"
       shell: bash
       working-directory: ./starsky
-      run: bash build.sh --Target BuildNetCore --no-sonar --no-publish --no-dependencies --skip --no-logo
+      run: bash build.sh --Target BuildNetCore --no-sonar --no-publish --no-dependencies --no-logo
 
     - name: "TestNetCore (Ubuntu)"
       shell: bash
       working-directory: ./starsky
-      run: bash build.sh --Target TestNetCore --skip --no-logo --no-publish
+      run: bash build.sh --Target TestNetCore --no-logo --no-publish
   
     - name: "Set locale to: nl_NL.UTF-8"
       run: |
@@ -71,7 +71,7 @@ jobs:
       working-directory: ./starsky
       run: |
           export LANG="nl_NL.UTF-8"
-          bash build.sh --Target TestNetCore --skip --no-dependencies --no-publish --no-logo
+          bash build.sh --Target TestNetCore --no-dependencies --no-publish --no-logo
 
   trigger_pipe_release_desktop:
   
diff --git a/.github/workflows/webapp-build-net-windows.yml b/.github/workflows/webapp-build-net-windows.yml
index 3199ba561f..7687d797dd 100644
--- a/.github/workflows/webapp-build-net-windows.yml
+++ b/.github/workflows/webapp-build-net-windows.yml
@@ -40,9 +40,9 @@ jobs:
     - name: Build (Windows)
       shell: pwsh
       working-directory: ./starsky
-      run: pwsh build.ps1 --Target BuildNetCore --no-sonar --no-dependencies --no-publish --skip --no-logo 
+      run: pwsh build.ps1 --Target BuildNetCore --no-sonar --no-dependencies --no-publish --no-logo 
       
     - name: Test (Windows)
       shell: pwsh
       working-directory: ./starsky
-      run: pwsh build.ps1 --Target TestNetCore --no-sonar --no-dependencies --no-publish --skip --no-logo
+      run: pwsh build.ps1 --Target TestNetCore --no-sonar --no-dependencies --no-publish --no-logo
diff --git a/pipelines/azure/steps/build_clientapp.yml b/pipelines/azure/steps/build_clientapp.yml
index 83bc6c084d..814a9ded03 100644
--- a/pipelines/azure/steps/build_clientapp.yml
+++ b/pipelines/azure/steps/build_clientapp.yml
@@ -32,7 +32,7 @@ steps:
       BUILD_SOURCEBRANCH: $(Build.SourceBranch)
     inputs:
       filePath: "starsky/build.ps1"
-      arguments: '${{ parameters.runtimeArg }} --target Client --skip --no-logo'
+      arguments: '${{ parameters.runtimeArg }} --target Client --no-logo'
       pwsh: true
       workingDirectory: "$(Build.SourcesDirectory)/starsky/"
 
@@ -43,6 +43,6 @@ steps:
       BUILD_SOURCEBRANCH: $(Build.SourceBranch)
     inputs:
       filePath: "starsky/build.ps1"
-      arguments: '${{ parameters.runtimeArg }} --no-unit-tests --target Client --skip --no-logo'
+      arguments: '${{ parameters.runtimeArg }} --no-unit-tests --target Client --no-logo'
       pwsh: true
       workingDirectory: "$(Build.SourcesDirectory)/starsky/"
diff --git a/pipelines/azure/steps/build_server.yml b/pipelines/azure/steps/build_server.yml
index c43cd2bcd7..d05bf0ee7d 100644
--- a/pipelines/azure/steps/build_server.yml
+++ b/pipelines/azure/steps/build_server.yml
@@ -25,7 +25,7 @@ steps:
       SONAR_TOKEN: $(STARSKY_SONAR_TOKEN)
     inputs:
       filePath: "starsky/build.ps1"
-      arguments: '${{ parameters.runtimeArg }} --target SonarBuildTest --branch "$(Build.SourceBranch)" --skip --no-logo'
+      arguments: '${{ parameters.runtimeArg }} --target SonarBuildTest  --branch "$(Build.SourceBranch)" --no-logo'
       pwsh: true
       workingDirectory: "$(Build.SourcesDirectory)/starsky/"
 
@@ -36,7 +36,7 @@ steps:
       BUILD_SOURCEBRANCH: $(Build.SourceBranch)
     inputs:
       filePath: "starsky/build.ps1"
-      arguments: '${{ parameters.runtimeArg }} --no-unit-tests --target SonarBuildTest --branch "$(Build.SourceBranch)" --skip --no-logo'
+      arguments: '${{ parameters.runtimeArg }} --target SonarBuildTest --skip Client --no-unit-tests  --branch "$(Build.SourceBranch)" --no-logo'
       pwsh: true
       workingDirectory: "$(Build.SourcesDirectory)/starsky/"
 
@@ -45,7 +45,7 @@ steps:
     condition: and(succeeded(), eq('${{ parameters.readyToRunEnabled }}', true) )
     inputs:
       filePath: "starsky/build.ps1"
-      arguments: '${{ parameters.runtimeArg }} --target BuildNetCoreRuntimeSpecific --skip --no-logo --ready-to-run'
+      arguments: '${{ parameters.runtimeArg }} --target BuildNetCoreRuntimeSpecific --skip Client SonarBuildTest --no-logo --ready-to-run'
       pwsh: true
       workingDirectory: "$(Build.SourcesDirectory)/starsky/"
 
@@ -54,7 +54,7 @@ steps:
     condition: and(succeeded(), ne('${{ parameters.readyToRunEnabled }}', true) )
     inputs:
       filePath: "starsky/build.ps1"
-      arguments: '${{ parameters.runtimeArg }} --target BuildNetCoreRuntimeSpecific --skip --no-logo'
+      arguments: '${{ parameters.runtimeArg }} --target BuildNetCoreRuntimeSpecific --skip Client SonarBuildTest --no-logo'
       pwsh: true
       workingDirectory: "$(Build.SourcesDirectory)/starsky/"
 
diff --git a/pipelines/azure/steps/build_zip_bundle.yml b/pipelines/azure/steps/build_zip_bundle.yml
index 6e23324974..42b32b5e82 100644
--- a/pipelines/azure/steps/build_zip_bundle.yml
+++ b/pipelines/azure/steps/build_zip_bundle.yml
@@ -7,6 +7,6 @@ steps:
     displayName: 'Nuke Zip'
     inputs:
       filePath: 'starsky/build.ps1'
-      arguments: '${{ parameters.runtimeArg }} --target Zip --skip --no-logo'
+      arguments: '${{ parameters.runtimeArg }} --target Zip --skip Client SonarBuildTest BuildNetCoreRuntimeSpecific --no-logo'
       pwsh: true
       workingDirectory: '$(Build.SourcesDirectory)/starsky/'
\ No newline at end of file
diff --git a/pipelines/azure/steps/coverage_report_merge.yml b/pipelines/azure/steps/coverage_report_merge.yml
index 7e148ea3f1..c2f487a452 100644
--- a/pipelines/azure/steps/coverage_report_merge.yml
+++ b/pipelines/azure/steps/coverage_report_merge.yml
@@ -8,11 +8,11 @@ steps:
     condition: and(succeeded(), eq('${{ parameters.unitTest }}', true) )
     inputs:
       filePath: 'starsky/build.ps1'
-      arguments: '${{ parameters.runtimeArg }} --target CoverageReport --skip --no-logo'
+      arguments: '${{ parameters.runtimeArg }} --target CoverageReport --skip Client SonarBuildTest --no-logo'
       pwsh: true
       workingDirectory: '$(Build.SourcesDirectory)/starsky/'
 
-  - task: PublishCodeCoverageResults@1
+  - task: PublishCodeCoverageResults@2
     condition: and(succeeded(), eq('${{ parameters.unitTest }}', true) )
     displayName: 'Publish code coverage from $(Build.SourcesDirectory)/starsky/starskytest/coverage-merge-cobertura.xml'
     inputs:
diff --git a/starsky/build/Build.cs b/starsky/build/Build.cs
index 8b229882e9..934561e1f1 100644
--- a/starsky/build/Build.cs
+++ b/starsky/build/Build.cs
@@ -35,7 +35,7 @@ public sealed class Build : NukeBuild
 	///   - Microsoft VSCode           https://nuke.build/vscode
 	public static int Main() => Execute<Build>(x => x.Compile);
 
-	// Use `--target BuildNetCoreRuntimeSpecific --skip` parameter to run only this task 
+	// Use `--target BuildNetCoreRuntimeSpecific --skip TASK` parameter to run only this task 
 
 	[Parameter(
 		"Configuration to build - Default is 'Debug' (local) or 'Release' (server)")]
diff --git a/starsky/build/helpers/DotnetRuntimeSpecificHelper.cs b/starsky/build/helpers/DotnetRuntimeSpecificHelper.cs
index ec6f3065b3..490d24f7f8 100644
--- a/starsky/build/helpers/DotnetRuntimeSpecificHelper.cs
+++ b/starsky/build/helpers/DotnetRuntimeSpecificHelper.cs
@@ -15,7 +15,7 @@
 namespace helpers;
 
 /// <summary>
-///     use --skip to run only this test
+///     use --skip TARGET/TASK to run only this test
 /// </summary>
 [SuppressMessage("Sonar",
 	"S2629: Don't use string interpolation in logging message templates",