diff --git a/.octopus/deployment_process.ocl b/.octopus/deployment_process.ocl
index e1dd203c4f..8d4530f617 100644
--- a/.octopus/deployment_process.ocl
+++ b/.octopus/deployment_process.ocl
@@ -8,7 +8,7 @@ step "upload-octopustools-to-s3-public-with-hashes" {
             PackageToUpload = "{\"PackageId\":\"OctopusTools.Zips\",\"FeedId\":\"octopus-server-built-in\"}"
             S3BucketPath = "#{AwsBucket}/octopus-tools/#{Octopus.Action.Package[PackageToUpload].PackageVersion}/"
         }
-        worker_pool = "hosted-windows-2019"
+        worker_pool = "hosted-windows"
 
         packages "PackageToUpload" {
             acquisition_location = "Server"
@@ -37,11 +37,11 @@ step "push-octopus-dotnet-cli-to-nuget-style-feed" {
                 
                 # nuget push
                 . $nugetExe push "$($OctopusParameters["Octopus.Action.Package[Octopus.DotNet.Cli].PackageFilePath"])"	-source $FeedUrl -apikey $FeedApiKey
-            EOT
+                EOT
             Octopus.Action.Script.ScriptSource = "Inline"
             Octopus.Action.Script.Syntax = "PowerShell"
         }
-        worker_pool = "hosted-windows-2019"
+        worker_pool = "hosted-windows"
 
         packages "NuGet.CommandLine" {
             acquisition_location = "Server"
@@ -89,11 +89,11 @@ step "push-octopustools-to-nuget-style-feed" {
                     }
                 }
                 exit 1
-            EOT
+                EOT
             Octopus.Action.Script.ScriptSource = "Inline"
             Octopus.Action.Script.Syntax = "PowerShell"
         }
-        worker_pool = "hosted-windows-2019"
+        worker_pool = "hosted-windows"
 
         packages "NuGet.CommandLine" {
             acquisition_location = "Server"
@@ -143,11 +143,11 @@ step "push-octopustools-to-chocolatey" {
                     }
                 }
                 exit 1
-            EOT
+                EOT
             Octopus.Action.Script.ScriptSource = "Inline"
             Octopus.Action.Script.Syntax = "PowerShell"
         }
-        worker_pool = "hosted-windows-2019"
+        worker_pool = "hosted-windows"
 
         packages "OctopusTools" {
             acquisition_location = "Server"
@@ -212,7 +212,7 @@ step "push-changes-to-homebrew-repo" {
                     && git push --repo $repoUrl --set-upstream origin $branchName \
                 )
                 
-            EOT
+                EOT
             Octopus.Action.Script.ScriptSource = "Inline"
             Octopus.Action.Script.Syntax = "Bash"
             OctopusUseBundledTooling = "False"
@@ -254,7 +254,7 @@ step "publish-homebrew" {
             PubHomebrew-RepoName = "homebrew-taps"
             PubHomebrew-Username = "#{HomeBrewGitUsername}"
         }
-        worker_pool = "hosted-windows-2019"
+        worker_pool = "hosted-windows"
 
         packages "PackageToUpload" {
             acquisition_location = "Server"
@@ -289,7 +289,7 @@ step "publish-to-apt-repo" {
                   --env AWS_SECRET_ACCESS_KEY="$(get_octopusvariable "LinuxPackagePublisherAwsAccount.SecretKey")" \
                   octopusdeploy/publish-linux bash -c 'cd /working && bash publish-apt.sh' 2>&1 || exit
                 
-            EOT
+                EOT
             Octopus.Action.Script.ScriptSource = "Inline"
             Octopus.Action.Script.Syntax = "Bash"
         }
@@ -327,7 +327,7 @@ step "publish-to-rpm-repo" {
                   --env AWS_SECRET_ACCESS_KEY="$(get_octopusvariable "LinuxPackagePublisherAwsAccount.SecretKey")" \
                   octopusdeploy/publish-linux bash -c 'cd /working && bash publish-rpm.sh' 2>&1 || exit
                 
-            EOT
+                EOT
             Octopus.Action.Script.ScriptSource = "Inline"
             Octopus.Action.Script.Syntax = "Bash"
         }
@@ -438,7 +438,7 @@ step "push-docker-images-to-prod" {
                 
                 Run
                 
-            EOT
+                EOT
             Octopus.Action.Script.ScriptSource = "Inline"
             Octopus.Action.Script.Syntax = "PowerShell"
         }
@@ -509,11 +509,11 @@ step "create-release-in-slipway" {
                 ReleaseToWeb "OctopusCli" $version $releaseNotes
                 
                 
-            EOT
+                EOT
             Octopus.Action.Script.ScriptSource = "Inline"
             Octopus.Action.Script.Syntax = "PowerShell"
         }
-        worker_pool = "hosted-windows-2019"
+        worker_pool = "hosted-windows"
 
         packages "OctopusTools" {
             acquisition_location = "NotAcquired"
@@ -537,7 +537,7 @@ step "invalidate-cloudfront-cache" {
             Octopus.Action.Template.Id = "ActionTemplates-962"
             Octopus.Action.Template.Version = "1"
         }
-        worker_pool = "hosted-windows-2019"
+        worker_pool = "hosted-windows"
     }
 }
 
@@ -553,6 +553,6 @@ step "invalidate-cloudflare-cache-of-the-octopustools-manifest" {
             Octopus.Action.Template.Id = "ActionTemplates-963"
             Octopus.Action.Template.Version = "6"
         }
-        worker_pool = "hosted-windows-2019"
+        worker_pool = "hosted-windows"
     }
 }
\ No newline at end of file
diff --git a/.octopus/deployment_settings.ocl b/.octopus/deployment_settings.ocl
index b3c750bc06..0b72577614 100644
--- a/.octopus/deployment_settings.ocl
+++ b/.octopus/deployment_settings.ocl
@@ -2,7 +2,7 @@ deployment_changes_template = <<-EOT
         #{each release in Octopus.Deployment.Changes}
         #{release.ReleaseNotes}
         #{/each}
-    EOT
+        EOT
 
 connectivity_policy {
 }
diff --git a/.octopus/schema_version.ocl b/.octopus/schema_version.ocl
index c62d1c32be..4548a61f7b 100644
--- a/.octopus/schema_version.ocl
+++ b/.octopus/schema_version.ocl
@@ -1 +1 @@
-version = 5
\ No newline at end of file
+version = 6
\ No newline at end of file