diff --git a/build/.azure-pipelines.TemplateValidation.yml b/build/.azure-pipelines.TemplateValidation.yml
index 18afce3d..c9d02639 100644
--- a/build/.azure-pipelines.TemplateValidation.yml
+++ b/build/.azure-pipelines.TemplateValidation.yml
@@ -70,7 +70,7 @@ jobs:
 
           $matrixGroups = [ordered]@{}
           $currentGroup = @()
-          $groupSize = 4
+          $groupSize = 5
 
           # Generate matrix for net8
           for ($i = 0; $i -lt $tests.Count; $i++) 
diff --git a/build/templates/package-validation.yml b/build/templates/package-validation.yml
index afe6d541..485bef4f 100644
--- a/build/templates/package-validation.yml
+++ b/build/templates/package-validation.yml
@@ -22,10 +22,9 @@ steps:
     sudo rm -fR /usr/local/.ghcup
     sudo rm -fR /usr/lib/mono
     sudo rm -fR /usr/share/dotnet
+    sudo snap remove lxd
     sudo snap remove core20
     sudo apt remove snapd
-    sudo apt remove swift
-    sudo apt remove pipx
 
     df -h
     cd /