diff --git a/cli-windows/build-bits.ps1 b/cli-windows/build-bits.ps1
index 272227b3d..a33f3bc8b 100644
--- a/cli-windows/build-bits.ps1
+++ b/cli-windows/build-bits.ps1
@@ -8,6 +8,9 @@ if ([string]::IsNullOrEmpty($rootPath)) {
 }
 Write-Host "Root path used is $rootPath" -ForegroundColor Yellow
 
+workflow BuildAndPublish {
+    param ([string] $rootPath
+    )
 $projectPaths = 
     @{Path="$rootPath\src\Web\WebMVC";Prj="WebMVC.csproj"},
     @{Path="$rootPath\src\Web\WebSPA";Prj="WebSPA.csproj"},
@@ -15,25 +18,25 @@ $projectPaths =
     @{Path="$rootPath\src\Services\Catalog\Catalog.API";Prj="Catalog.API.csproj"},
     @{Path="$rootPath\src\Services\Ordering\Ordering.API";Prj="Ordering.API.csproj"},
     @{Path="$rootPath\src\Services\Basket\Basket.API";Prj="Basket.API.csproj"},
-    @{Path="$rootPath\src\Services\GracePeriod\GracePeriodManager";Prj="GracePeriodManager.csproj"},
     @{Path="$rootPath\src\Services\Location\Locations.API";Prj="Locations.API.csproj"},
     @{Path="$rootPath\src\Services\Marketing\Marketing.API";Prj="Marketing.API.csproj"},
     @{Path="$rootPath\src\Services\Payment\Payment.API";Prj="Payment.API.csproj"},
     @{Path="$rootPath\src\Web\WebStatus";Prj="WebStatus.csproj"}
 
-$projectPaths | foreach {
-    $projectPath = $_.Path
-    $projectFile = $_.Prj
-    $outPath = $_.Path + "\obj\Docker\publish"
-    $projectPathAndFile = "$projectPath\$projectFile"
-    Write-Host "Deleting old publish files in $outPath" -ForegroundColor Yellow
-    remove-item -path $outPath -Force -Recurse -ErrorAction SilentlyContinue
-    Write-Host "Publishing $projectPathAndFile to $outPath" -ForegroundColor Yellow
-    dotnet restore $projectPathAndFile
-    dotnet build $projectPathAndFile
-    dotnet publish $projectPathAndFile -o $outPath
+    foreach -parallel ($item in $projectPaths) {
+        $projectPath = $item.Path
+        $projectFile = $item.Prj
+        $outPath = $item.Path + "\obj\Docker\publish"
+        $projectPathAndFile = "$projectPath\$projectFile"
+        #Write-Host "Deleting old publish files in $outPath" -ForegroundColor Yellow
+        remove-item -path $outPath -Force -Recurse -ErrorAction SilentlyContinue
+        #Write-Host "Publishing $projectPathAndFile to $outPath" -ForegroundColor Yellow
+        dotnet build $projectPathAndFile
+        dotnet publish $projectPathAndFile -o $outPath 
+    }
 }
 
+BuildAndPublish $rootPath
 
 ########################################################################################
 # Delete old eShop Docker images