diff --git a/pom.xml b/pom.xml
index d15a24e0..2e668684 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
                 <artifactId>bom-${jenkins.baseline}.x</artifactId>
-                <version>4545.v56392b_7ca_7b_a_</version>
+                <version>4570.v1b_c718dd3b_1e</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -151,7 +151,7 @@
                     <dependency>
                         <groupId>com.puppycrawl.tools</groupId>
                         <artifactId>checkstyle</artifactId>
-                        <version>10.21.4</version>
+                        <version>10.23.0</version>
                     </dependency>
                 </dependencies>
                 <executions>
diff --git a/src/main/java/com/microsoft/azure/vmagent/builders/AzureVMTemplateBuilder.java b/src/main/java/com/microsoft/azure/vmagent/builders/AzureVMTemplateBuilder.java
index cb146740..3bc44845 100644
--- a/src/main/java/com/microsoft/azure/vmagent/builders/AzureVMTemplateBuilder.java
+++ b/src/main/java/com/microsoft/azure/vmagent/builders/AzureVMTemplateBuilder.java
@@ -6,6 +6,7 @@
 import com.microsoft.azure.vmagent.launcher.AzureInboundLauncher;
 import com.microsoft.azure.vmagent.launcher.AzureSSHLauncher;
 import com.microsoft.azure.vmagent.util.Constants;
+import com.microsoft.azure.vmagent.availability.NoAvailabilityRequired;
 
 public class AzureVMTemplateBuilder extends AzureVMTemplateFluent<AzureVMTemplateBuilder> {
 
@@ -13,6 +14,7 @@ public class AzureVMTemplateBuilder extends AzureVMTemplateFluent<AzureVMTemplat
 
     public AzureVMTemplateBuilder() {
         this.fluent = this;
+        fluent.withMaxVirtualMachinesLimit("10");
     }
 
     public AzureVMTemplateBuilder(AzureVMAgentTemplate template) {
@@ -96,7 +98,7 @@ public AzureVMAgentTemplate build() {
                 fluent.getDescription(),
                 fluent.getLabels(),
                 fluent.getLocation(),
-                null,
+                new NoAvailabilityRequired(),
                 fluent.getVirtualMachineSize(),
                 fluent.getStorageAccountNameReferenceType(),
                 fluent.getStorageAccountType(),
diff --git a/src/main/java/com/microsoft/azure/vmagent/builders/AzureVMTemplateFluent.java b/src/main/java/com/microsoft/azure/vmagent/builders/AzureVMTemplateFluent.java
index 3efd8d04..fbd89993 100644
--- a/src/main/java/com/microsoft/azure/vmagent/builders/AzureVMTemplateFluent.java
+++ b/src/main/java/com/microsoft/azure/vmagent/builders/AzureVMTemplateFluent.java
@@ -12,6 +12,8 @@
 
 public class AzureVMTemplateFluent<T extends AzureVMTemplateFluent<T>> {
 
+    private String maxVirtualMachinesLimit;
+
     private String name;
 
     private String description;
@@ -57,6 +59,7 @@ public class AzureVMTemplateFluent<T extends AzureVMTemplateFluent<T>> {
     private List<AzureTagPair> cloudTags;
 
     public AzureVMTemplateFluent() {
+        maxVirtualMachinesLimit = "10";
         location = "Japan West";
         virtualMachineSize = "Standard_A0";
         storageAccountType = "Standard_LRS";
@@ -73,6 +76,11 @@ public AzureVMTemplateFluent() {
     }
 
     //CHECKSTYLE:OFF
+    public T withMaxVirtualMachinesLimit(String maxVirtualMachinesLimit) {
+        this.maxVirtualMachinesLimit = maxVirtualMachinesLimit;
+        return (T) this;
+    }
+
     public T withName(String name) {
         this.name = name;
         return (T) this;
@@ -208,6 +216,10 @@ public T withAdminCredential(String credentialsId) {
     }
     //CHECKSTYLE:ON
 
+    public String getMaxVirtualMachinesLimit() {
+        return maxVirtualMachinesLimit;
+    }
+
     public String getName() {
         return name;
     }