diff --git a/pom.xml b/pom.xml
index ed13db5..259a00f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
         <version>4.9</version>
-        <relativePath />
+        <relativePath/>
     </parent>
 
     <artifactId>spotinst</artifactId>
@@ -14,7 +15,6 @@
     <packaging>hpi</packaging>
 
     <name>Spotinst plugin</name>
-    <description>This plugin allows Jenkins to start agents with the Spot framework and terminate them as they become idle.</description>
     <url>https://github.com/jenkinsci/spotinst-plugin/blob/master/JenkinsWiki.adoc</url>
     <licenses>
         <license>
@@ -33,19 +33,39 @@
     </developers>
 
     <scm>
-        <connection>scm:git:git://github.com/jenkinsci/spotinst-plugin.git</connection>
+        <connection>scm:git:https://github.com/jenkinsci/spotinst-plugin.git</connection>
         <developerConnection>scm:git:git@github.com:jenkinsci/spotinst-plugin.git</developerConnection>
         <url>https://github.com/jenkinsci/spotinst-plugin</url>
         <tag>HEAD</tag>
     </scm>
 
     <properties>
-        <jenkins.version>2.222.4</jenkins.version>
-        <java.level>8</java.level>
+        <jenkins.version>2.426.3</jenkins.version>
+        <java.level>11</java.level>
+        <java.version>11</java.version>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.release>11</maven.compiler.release>
+        <access-modifier.version>1.33</access-modifier.version>
     </properties>
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.jenkins-ci.plugins</groupId>
+                <artifactId>variant</artifactId>
+                <version>60.v7290fc0eb_b_cd</version>
+            </dependency>
+            <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>javax.servlet-api</artifactId>
+                <version>4.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-logging</groupId>
+                <artifactId>commons-logging</artifactId>
+                <version>1.3.1</version>
+            </dependency>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
                 <artifactId>bom-2.249.x</artifactId>
@@ -53,64 +73,323 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>2.15.1</version>
+            </dependency>
+            <dependency>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-annotations</artifactId>
+                <version>4.8.3</version>
+            </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>4.13.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.kohsuke.stapler</groupId>
+                <artifactId>stapler</artifactId>
+                <version>1839.ved17667b_a_eb_5</version>
+            </dependency>
+            <dependency>
+                <groupId>args4j</groupId>
+                <artifactId>args4j</artifactId>
+                <version>2.37</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.code.findbugs</groupId>
+                <artifactId>jsr305</artifactId>
+                <version>3.0.2</version>
+                <optional>true</optional>
+            </dependency>
+            <dependency>
+                <groupId>com.google.errorprone</groupId>
+                <artifactId>error_prone_annotations</artifactId>
+                <version>2.26.1</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>33.1.0-jre</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava-testlib</artifactId>
+                <version>33.1.0-jre</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.inject</groupId>
+                <artifactId>guice</artifactId>
+                <version>7.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.inject</groupId>
+                <artifactId>guice</artifactId>
+                <version>7.0.0</version>
+                <classifier>classes</classifier>
+            </dependency>
+            <dependency>
+                <groupId>com.google.inject.extensions</groupId>
+                <artifactId>guice-assistedinject</artifactId>
+                <version>7.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.inject.extensions</groupId>
+                <artifactId>guice-dagger-adapter</artifactId>
+                <version>7.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.inject.extensions</groupId>
+                <artifactId>guice-grapher</artifactId>
+                <version>7.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.inject.extensions</groupId>
+                <artifactId>guice-jmx</artifactId>
+                <version>7.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.inject.extensions</groupId>
+                <artifactId>guice-jndi</artifactId>
+                <version>7.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.inject.extensions</groupId>
+                <artifactId>guice-persist</artifactId>
+                <version>7.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.inject.extensions</groupId>
+                <artifactId>guice-servlet</artifactId>
+                <version>7.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.inject.extensions</groupId>
+                <artifactId>guice-spring</artifactId>
+                <version>7.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.inject.extensions</groupId>
+                <artifactId>guice-struts2</artifactId>
+                <version>7.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.inject.extensions</groupId>
+                <artifactId>guice-testlib</artifactId>
+                <version>7.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.inject.extensions</groupId>
+                <artifactId>guice-throwingproviders</artifactId>
+                <version>7.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.google.truth</groupId>
+                <artifactId>truth</artifactId>
+                <version>1.4.2</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.google.truth.extensions</groupId>
+                <artifactId>truth-java8-extension</artifactId>
+                <version>1.4.2</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>1.16.1</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
+                <version>20040616</version>
+            </dependency>
+            <dependency>
+                <groupId>io.jenkins</groupId>
+                <artifactId>configuration-as-code</artifactId>
+                <version>1775.v810dc950b_514</version>
+            </dependency>
+            <dependency>
+                <groupId>io.jenkins.configuration-as-code</groupId>
+                <artifactId>test-harness</artifactId>
+                <version>1775.v810dc950b_514</version>
+            </dependency>
+            <dependency>
+                <groupId>io.jenkins.plugins</groupId>
+                <artifactId>snakeyaml-api</artifactId>
+                <version>2.2-111.vc6598e30cc65</version>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.mojo.signature</groupId>
+                <artifactId>java18</artifactId>
+                <version>1.0</version>
+                <type>signature</type>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
     <dependencies>
+        <dependency>
+            <groupId>com.github.spotbugs</groupId>
+            <artifactId>spotbugs-annotations</artifactId>
+            <version>4.8.3</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.3.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.13.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>4.0.1</version>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5</version>
+            <version>4.5.14</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpcore</artifactId>
-            <version>4.4.1</version>
+            <version>4.4.16</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.7.4</version>
+            <version>2.17.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.7.4</version>
+            <version>2.17.0</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.7.4</version>
+            <version>2.17.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>animal-sniffer-annotations</artifactId>
+            <version>1.23</version>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
-            <version>1.8.4</version>
+            <version>2.0.2-beta</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.main</groupId>
+            <artifactId>jenkins-test-harness</artifactId>
+            <version>2182.v0138ccb_c0b_cb_</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci</groupId>
+            <artifactId>test-annotations</artifactId>
+            <version>1.4</version>
+        </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>trilead-api</artifactId>
-            <version>1.0.13</version>
+            <version>2.142.v748523a_76693</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci</groupId>
+            <artifactId>symbol-annotation</artifactId>
+            <version>1.24</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>ssh-credentials</artifactId>
+            <version>334.v7732563deee1</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>ssh-slaves</artifactId>
-            <version>1.31.3</version>
+            <version>2.948.vb_8050d697fec</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>structs</artifactId>
+            <version>337.v1b_04ea_4df7c8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>credentials</artifactId>
+            <version>1337.v60b_d7b_c7b_c9f</version>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>plain-credentials</artifactId>
-            <version>1.7</version>
+            <version>179.vc5cb_98f6db_38</version>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-collections4</artifactId>
             <version>4.4</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.16.1</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.kohsuke.stapler</groupId>
+            <artifactId>stapler</artifactId>
+            <version>1839.ved17667b_a_eb_5</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.twdata.maven</groupId>
+            <artifactId>mojo-executor</artifactId>
+            <version>2.4.0</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.inject</groupId>
+            <artifactId>javax.inject</artifactId>
+            <version>1</version>
         </dependency>
     </dependencies>
 
     <repositories>
+        <repository>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <id>central</id>
+            <name>Maven Repository Switchboard</name>
+            <url>https://repo1.maven.org/maven2</url>
+        </repository>
         <repository>
             <id>repo.jenkins-ci.org</id>
             <url>http://repo.jenkins-ci.org/public/</url>
@@ -118,9 +397,20 @@
     </repositories>
 
     <pluginRepositories>
+        <pluginRepository>
+            <releases>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <id>central</id>
+            <name>Maven Plugin Repository</name>
+            <url>https://repo1.maven.org/maven2</url>
+        </pluginRepository>
         <pluginRepository>
             <id>repo.jenkins-ci.org</id>
-            <url>http://repo.jenkins-ci.org/public/</url>
+            <url>https://repo.jenkins-ci.org/public/</url>
         </pluginRepository>
     </pluginRepositories>
 
@@ -128,18 +418,100 @@
         <pluginManagement>
             <plugins>
                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>3.2.5</version>
+                    <configuration>
+                        <argLine>
+                            --illegal-access=permit
+                        </argLine>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <version>3.0.0-M4</version>
+                    <configuration>
+                        <argLine>
+                            --illegal-access=permit
+                        </argLine>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.jenkins-ci.tools</groupId>
+                    <artifactId>maven-hpi-plugin</artifactId>
+                    <version>3.48</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>3.8.1</version>
                     <configuration>
-                        <skip>true</skip>
+                        <source>11</source>
+                        <target>11</target>
+                        <release>11</release>
                     </configuration>
+                </plugin>
+                <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>findbugs-maven-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <phase>none</phase>
-                        </execution>
-                    </executions>
+                    <version>3.0.5</version>
                 </plugin>
             </plugins>
         </pluginManagement>
+
+        <plugins>
+            <plugin>
+                <groupId>org.jenkins-ci.tools</groupId>
+                <artifactId>maven-hpi-plugin</artifactId>
+                <version>3.48</version>
+            </plugin>
+            <plugin>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.4.1</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>extra-enforcer-rules</artifactId>
+                        <version>1.8.0</version>
+                        <scope>compile</scope>
+                    </dependency>
+                </dependencies>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>animal-sniffer-maven-plugin</artifactId>
+                <version>1.19</version>
+                <executions>
+                    <execution>
+                        <id>check</id>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>check</goal>
+                        </goals>
+                        <configuration>
+                            <signature>
+                                <groupId>org.codehaus.mojo.signature</groupId>
+                                <artifactId>java18</artifactId>
+                            </signature>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <skip>true</skip>
+                    <signature>
+                        <groupId>org.codehaus.mojo.signature</groupId>
+                        <artifactId>java18</artifactId>
+                        <version>1.0</version>
+                    </signature>
+                    <ignores>java.lang.invoke.MethodHandle</ignores>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>11.0.20</version>
+            </plugin>
+        </plugins>
     </build>
 </project>
diff --git a/src/main/java/hudson/plugins/spotinst/api/SpotinstApi.java b/src/main/java/hudson/plugins/spotinst/api/SpotinstApi.java
index abac8e9..8cd62c4 100644
--- a/src/main/java/hudson/plugins/spotinst/api/SpotinstApi.java
+++ b/src/main/java/hudson/plugins/spotinst/api/SpotinstApi.java
@@ -16,9 +16,9 @@
 import hudson.plugins.spotinst.model.redis.LockGroupControllerRequest;
 import hudson.plugins.spotinst.model.redis.LockGroupControllerResponse;
 import jenkins.model.Jenkins;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/hudson/plugins/spotinst/cloud/AwsSpotinstCloud.java b/src/main/java/hudson/plugins/spotinst/cloud/AwsSpotinstCloud.java
index b6ed9fe..910d02f 100644
--- a/src/main/java/hudson/plugins/spotinst/cloud/AwsSpotinstCloud.java
+++ b/src/main/java/hudson/plugins/spotinst/cloud/AwsSpotinstCloud.java
@@ -298,26 +298,34 @@ protected BlResponse<Boolean> checkIsStatefulGroup() {
         ApiResponse<AwsGroup> groupResponse = awsGroupRepo.getGroup(groupId, this.accountId);
 
         if (groupResponse.isRequestSucceed()) {
-            Boolean          result        = false;
-            AwsGroup         awsGroup      = groupResponse.getValue();
+            Boolean result = getIsStatefulFromGroup(groupResponse.getValue());
+
+            retVal = new BlResponse<>(result);
+        }
+        else {
+            LOGGER.error(String.format("Failed to get group %s. Errors: %s", groupId, groupResponse.getErrors()));
+            retVal = new BlResponse<>(false);
+        }
+
+        return retVal;
+    }
+
+    private static Boolean getIsStatefulFromGroup(AwsGroup awsGroup) {
+        boolean          retVal        = false;
+
+        if(awsGroup != null) {
             AwsGroupStrategy groupStrategy = awsGroup.getStrategy();
 
             if (groupStrategy != null) {
                 AwsGroupPersistence groupPersistence = groupStrategy.getPersistence();
 
                 if (groupPersistence != null) {
-                    result = BooleanUtils.isTrue(groupPersistence.getShouldPersistPrivateIp()) ||
+                    retVal = BooleanUtils.isTrue(groupPersistence.getShouldPersistPrivateIp()) ||
                              BooleanUtils.isTrue(groupPersistence.getShouldPersistBlockDevices()) ||
                              BooleanUtils.isTrue(groupPersistence.getShouldPersistRootDevice()) ||
                              StringUtils.isNotEmpty(groupPersistence.getBlockDevicesMode());
                 }
             }
-
-            retVal = new BlResponse<>(result);
-        }
-        else {
-            LOGGER.error(String.format("Failed to get group %s. Errors: %s", groupId, groupResponse.getErrors()));
-            retVal = new BlResponse<>(false);
         }
 
         return retVal;
diff --git a/src/main/java/hudson/plugins/spotinst/cloud/BaseSpotinstCloud.java b/src/main/java/hudson/plugins/spotinst/cloud/BaseSpotinstCloud.java
index dfc5ed9..b0d9cc4 100644
--- a/src/main/java/hudson/plugins/spotinst/cloud/BaseSpotinstCloud.java
+++ b/src/main/java/hudson/plugins/spotinst/cloud/BaseSpotinstCloud.java
@@ -177,6 +177,11 @@ public Collection<PlannedNode> provision(Label label, int excessWorkload) {
         return Collections.emptyList();
     }
 
+    @Override
+    public Collection<NodeProvisioner.PlannedNode> provision(CloudState state, int excessWorkload) {
+        return this.provision(state.getLabel(), excessWorkload);
+    }
+
     @Override
     public boolean canProvision(Label label) {
         boolean canProvision = true;
@@ -193,6 +198,11 @@ public boolean canProvision(Label label) {
         return canProvision;
     }
 
+    @Override
+    public boolean canProvision(CloudState state) {
+        return this.canProvision(state.getLabel());
+    }
+
     @Override
     public DescriptorImpl getDescriptor() {
         return (DescriptorImpl) super.getDescriptor();
diff --git a/src/main/java/hudson/plugins/spotinst/cloud/monitor/AwsSpotinstCloudInstanceTypeMonitor.java b/src/main/java/hudson/plugins/spotinst/cloud/monitor/AwsSpotinstCloudInstanceTypeMonitor.java
index 180c70e..1dcf563 100644
--- a/src/main/java/hudson/plugins/spotinst/cloud/monitor/AwsSpotinstCloudInstanceTypeMonitor.java
+++ b/src/main/java/hudson/plugins/spotinst/cloud/monitor/AwsSpotinstCloudInstanceTypeMonitor.java
@@ -5,7 +5,7 @@
 import hudson.plugins.spotinst.cloud.AwsSpotinstCloud;
 import hudson.slaves.Cloud;
 import jenkins.model.Jenkins;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
diff --git a/src/main/java/hudson/plugins/spotinst/cloud/monitor/SpotinstCloudsCommunicationMonitor.java b/src/main/java/hudson/plugins/spotinst/cloud/monitor/SpotinstCloudsCommunicationMonitor.java
index c87b3fc..957c2d5 100644
--- a/src/main/java/hudson/plugins/spotinst/cloud/monitor/SpotinstCloudsCommunicationMonitor.java
+++ b/src/main/java/hudson/plugins/spotinst/cloud/monitor/SpotinstCloudsCommunicationMonitor.java
@@ -6,7 +6,7 @@
 import hudson.plugins.spotinst.common.GroupLockingManager;
 import hudson.plugins.spotinst.common.SpotinstCloudCommunicationState;
 import jenkins.model.Jenkins;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
diff --git a/src/main/java/hudson/plugins/spotinst/jobs/SpotinstSyncGroupsController.java b/src/main/java/hudson/plugins/spotinst/jobs/SpotinstSyncGroupsController.java
index 222edd1..61a3096 100644
--- a/src/main/java/hudson/plugins/spotinst/jobs/SpotinstSyncGroupsController.java
+++ b/src/main/java/hudson/plugins/spotinst/jobs/SpotinstSyncGroupsController.java
@@ -10,7 +10,7 @@
 import hudson.plugins.spotinst.jobs.jobSynchronizer.JobSynchronizer;
 import hudson.slaves.Cloud;
 import jenkins.model.Jenkins;
-import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/resources/index.jelly b/src/main/resources/index.jelly
new file mode 100644
index 0000000..61b3296
--- /dev/null
+++ b/src/main/resources/index.jelly
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?jelly escape-by-default='true'?>
+<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form">
+        <div>
+                This plugin allows Jenkins to start agents with the Spot framework and terminate them as they become idle.
+        </div>
+</j:jelly>
diff --git a/src/test/java/hudson/plugins/spotinst/SpotinstCloudTest.java b/src/test/java/hudson/plugins/spotinst/SpotinstCloudTest.java
index 3f28084..56111b5 100644
--- a/src/test/java/hudson/plugins/spotinst/SpotinstCloudTest.java
+++ b/src/test/java/hudson/plugins/spotinst/SpotinstCloudTest.java
@@ -1,5 +1,6 @@
 package hudson.plugins.spotinst;
 
+import hudson.model.Label;
 import hudson.model.Node;
 import hudson.plugins.spotinst.api.infra.ApiResponse;
 import hudson.plugins.spotinst.cloud.*;
@@ -90,13 +91,14 @@ private PendingInstance buildPendingInstance(String id, Integer executors) {
     @Test
     public void testAwsProvision_whenThereArePendingInsatcnesForAllExecutors_thenShouldNotSacleUp() {
         String groupId = "sig-1";
+        String accountId = "act-111";
         BaseSpotinstCloud spotinstCloud =
                 new AwsSpotinstCloud(groupId, "", "20", "/tmp", null, SlaveUsageEnum.NORMAL, "", false, true, "", null,
-                                     null, null, null, null, null, null, null);
+                                     null, accountId, null, null, null, null, null);
         Map<String, PendingInstance> pendingInstances = new HashMap<>();
         pendingInstances.put("sir-1", buildPendingInstance("sir-1", 2));
         spotinstCloud.setPendingInstances(pendingInstances);
-        spotinstCloud.provision(null, 2);
+        spotinstCloud.provision((Label)null, 2);
         Mockito.verify(RepoManager.getInstance().getAwsGroupRepo(), Mockito.never())
                .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString());
     }
@@ -124,7 +126,7 @@ public void testAwsProvision_whenThereArePendingInsatcnesForPartOfTheExecutors_t
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(result));
 
-        spotinstCloud.provision(null, 4);
+        spotinstCloud.provision((Label)null, 4);
 
         ArgumentCaptor<String>  groupCapture     = ArgumentCaptor.forClass(String.class);
         ArgumentCaptor<Integer> unitsCapture     = ArgumentCaptor.forClass(Integer.class);
@@ -138,8 +140,9 @@ public void testAwsProvision_whenThereArePendingInsatcnesForPartOfTheExecutors_t
     @Test
     public void testAwCloud_whenNoConnectionMethodIsProvided_thenDefaultIsJNLP() {
         String groupId = "sig-1";
+        String accountId = "act-111";
         BaseSpotinstCloud spotCloud =
-                new AwsSpotinstCloud(groupId, "", "20", "/tmp", null, null, "", true, null, null, null, null, null,
+                new AwsSpotinstCloud(groupId, "", "20", "/tmp", null, null, "", true, null, null, null, null, accountId,
                                      null, null, false, null, null);
         jenkinsRule.jenkins.clouds.add(spotCloud);
         assertEquals(spotCloud.getConnectionMethod(), ConnectionMethodEnum.JNLP);
@@ -158,7 +161,7 @@ public void testAwCloud_whenNoConnectionMethodIsProvided_thenDefaultIsJNLP() {
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(result));
 
-        spotCloud.provision(null, 2);
+        spotCloud.provision((Label)null, 2);
 
         List<Node> allNodes = Jenkins.get().getNodes();
 
@@ -208,7 +211,7 @@ public void testAwsCloud_whenSshConnectionMethod_andIpIsAvailable_thenCreateSshL
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(scaleUpResult));
 
-        spotCloud.provision(null, 1);
+        spotCloud.provision((Label)null, 1);
         spotCloud.monitorInstances();
 
         SpotinstSlave agent = (SpotinstSlave) Jenkins.get().getNode(incomingInstance.getInstanceId());
@@ -255,7 +258,7 @@ public void testAwsCloud_whenSshConnectionMethod_andIpIsNotAvailable_thenDoNotCo
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(scaleUpResult));
 
-        spotCloud.provision(null, 1);
+        spotCloud.provision((Label)null, 1);
 
         spotCloud.monitorInstances();
 
@@ -271,8 +274,9 @@ public void testAwsCloud_whenSshConnectionMethod_andIpIsNotAvailable_thenDoNotCo
     @Test
     public void testAwCloud_whenUsePrivateIpIsNull_thenUsePublicIp() {
         String groupId = "sig-1";
+        String accountId = "act-111";
         BaseSpotinstCloud spotCloud =
-                new AwsSpotinstCloud(groupId, "", "20", "/tmp", null, null, "", true, null, null, null, null, null,
+                new AwsSpotinstCloud(groupId, "", "20", "/tmp", null, null, "", true, null, null, null, null, accountId,
                                      null, null, null, null, null);
 
         assertFalse(spotCloud.getShouldUsePrivateIp());
@@ -281,8 +285,9 @@ public void testAwCloud_whenUsePrivateIpIsNull_thenUsePublicIp() {
     @Test
     public void testAwCloud_whenUsePrivateIpIsTrue_thenUsePrivateIp() {
         String groupId = "sig-1";
+        String accountId = "act-111";
         BaseSpotinstCloud spotCloud =
-                new AwsSpotinstCloud(groupId, "", "20", "/tmp", null, null, "", true, null, null, null, null, null,
+                new AwsSpotinstCloud(groupId, "", "20", "/tmp", null, null, "", true, null, null, null, null, accountId,
                                      null, null, true, null, null);
 
         assertTrue(spotCloud.getShouldUsePrivateIp());
@@ -291,8 +296,9 @@ public void testAwCloud_whenUsePrivateIpIsTrue_thenUsePrivateIp() {
     @Test
     public void testAwCloud_whenUsePrivateIpIsFalse_thenUsePublicIp() {
         String groupId = "sig-1";
+        String accountId = "act-111";
         BaseSpotinstCloud spotCloud =
-                new AwsSpotinstCloud(groupId, "", "20", "/tmp", null, null, "", true, null, null, null, null, null,
+                new AwsSpotinstCloud(groupId, "", "20", "/tmp", null, null, "", true, null, null, null, null, accountId,
                                      null, null, false, null, null);
 
         assertFalse(spotCloud.getShouldUsePrivateIp());
@@ -303,13 +309,14 @@ public void testAwCloud_whenUsePrivateIpIsFalse_thenUsePublicIp() {
     @Test
     public void testGcpProvision_whenThereArePendingInsatcnesForAllExecutors_thenShouldNotSacleUp() {
         String groupId = "sig-1";
+        String accountId = "act-111";
         BaseSpotinstCloud spotinstCloud =
-                new GcpSpotinstCloud(groupId, "", "20", "/tmp", null, "", false, true, "", null, null, null, null, null,
+                new GcpSpotinstCloud(groupId, "", "20", "/tmp", null, "", false, true, "", null, null, accountId, null, null,
                                      null, null, null);
         Map<String, PendingInstance> pendingInstances = new HashMap<>();
         pendingInstances.put("sin-1", buildPendingInstance("sin-1", 2));
         spotinstCloud.setPendingInstances(pendingInstances);
-        spotinstCloud.provision(null, 2);
+        spotinstCloud.provision((Label)null, 2);
         Mockito.verify(RepoManager.getInstance().getGcpGroupRepo(), Mockito.never())
                .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString());
     }
@@ -336,7 +343,7 @@ public void testGcpProvision_whenThereArePendingInsatcnesForPartOfTheExecutors_t
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(result));
 
-        spotinstCloud.provision(null, 4);
+        spotinstCloud.provision((Label)null, 4);
 
         ArgumentCaptor<String>  groupCapture = ArgumentCaptor.forClass(String.class);
         ArgumentCaptor<Integer> unitsCapture = ArgumentCaptor.forClass(Integer.class);
@@ -352,14 +359,15 @@ public void testGcpProvision_whenThereArePendingInsatcnesForPartOfTheExecutors_t
     @Test
     public void testAzureProvision_whenThereArePendingInsatcnesForAllExecutors_thenShouldNotSacleUp() {
         String groupId = "sig-1";
+        String accountId = "act-111";
         BaseSpotinstCloud spotinstCloud =
-                new AzureSpotinstCloud(groupId, "", "20", "/tmp", null, "", false, false, "", null, null, null, null,
+                new AzureSpotinstCloud(groupId, "", "20", "/tmp", null, "", false, false, "", null, null, accountId, null,
                                        null, null, null, null);
         Map<String, PendingInstance> pendingInstances = new HashMap<>();
         pendingInstances.put("q3213", buildPendingInstance(groupId, 1));
         pendingInstances.put("41234", buildPendingInstance(groupId, 1));
         spotinstCloud.setPendingInstances(pendingInstances);
-        spotinstCloud.provision(null, 2);
+        spotinstCloud.provision((Label)null, 2);
         Mockito.verify(RepoManager.getInstance().getAzureGroupRepo(), Mockito.never())
                .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString());
     }
@@ -380,7 +388,7 @@ public void testAzureProvision_whenThereArePendingInsatcnesForPartOfTheExecutors
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(Boolean.TRUE));
 
-        spotinstCloud.provision(null, 4);
+        spotinstCloud.provision((Label)null, 4);
 
         ArgumentCaptor<String>  groupCapture     = ArgumentCaptor.forClass(String.class);
         ArgumentCaptor<Integer> unitsCapture     = ArgumentCaptor.forClass(Integer.class);
@@ -396,14 +404,15 @@ public void testAzureProvision_whenThereArePendingInsatcnesForPartOfTheExecutors
     @Test
     public void testAzureV3Provision_whenThereArePendingInstancesForAllExecutors_thenShouldNotScaleUp() {
         String groupId = "sig-1";
+        String accountId = "act-111";
         BaseSpotinstCloud spotinstCloud =
-                new AzureSpotCloud(groupId, "", "20", "/tmp", null, "", false, true, "", null, null, null, null, null,
+                new AzureSpotCloud(groupId, "", "20", "/tmp", null, "", false, true, "", null, null, accountId, null, null,
                                    null, null, null);
 
         Map<String, PendingInstance> pendingInstances = new HashMap<>();
         pendingInstances.put("vm-1", buildPendingInstance("vm-1", 2));
         spotinstCloud.setPendingInstances(pendingInstances);
-        spotinstCloud.provision(null, 2);
+        spotinstCloud.provision((Label)null, 2);
 
         Mockito.verify(RepoManager.getInstance().getAzureVmGroupRepo(), Mockito.never())
                .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString());
@@ -432,7 +441,7 @@ public void testAzureV3Provision_whenThereArePendingInstancesForPartOfTheExecuto
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(vms));
 
-        spotinstCloud.provision(null, 4);
+        spotinstCloud.provision((Label)null, 4);
 
         ArgumentCaptor<String>  groupCapture     = ArgumentCaptor.forClass(String.class);
         ArgumentCaptor<Integer> unitsCapture     = ArgumentCaptor.forClass(Integer.class);
@@ -463,7 +472,7 @@ public void testAzureV3Provision_whenUnrecognizedVmSize_thenDefaultTo1Executor()
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(vms));
 
-        spotinstCloud.provision(null, 4);
+        spotinstCloud.provision((Label)null, 4);
 
         Node node = Jenkins.get().getNode("vm-2");
         assertNotNull(node);
@@ -497,7 +506,7 @@ public void testAzureV3Provision_whenNewInstancesAreLaunched_thenTheirSizeIsAcco
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(vms));
 
-        spotinstCloud.provision(null, 4);
+        spotinstCloud.provision((Label)null, 4);
 
         List<Node> allNodes = Jenkins.get().getNodes();
 
@@ -538,8 +547,8 @@ public void testAzureV3Provision_whenNewInstancesAreLaunched_thenTheirSizeIsAcco
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(vms));
 
-        spotinstCloud.provision(null, 3);
-        spotinstCloud.provision(null, 2);
+        spotinstCloud.provision((Label)null, 3);
+        spotinstCloud.provision((Label)null, 2);
 
         Mockito.verify(RepoManager.getInstance().getAzureVmGroupRepo(), Mockito.times(1))
                .scaleUp(groupId, 1, accountId);
@@ -550,8 +559,9 @@ public void testAzureV3Provision_whenNewInstancesAreLaunched_thenTheirSizeIsAcco
     @Test
     public void testAzureV3Cloud_whenNoConnectionMethodIsProvided_thenDefaultIsJNLP() {
         String groupId = "sig-1";
+        String accountId = "act-111";
         BaseSpotinstCloud spotCloud =
-                new AzureSpotCloud(groupId, "", "20", "/tmp", null, "", false, true, "", null, null, null, null, null,
+                new AzureSpotCloud(groupId, "", "20", "/tmp", null, "", false, true, "", null, null, accountId, null, null,
                                    null, null, null);
 
         jenkinsRule.jenkins.clouds.add(spotCloud);
@@ -569,7 +579,7 @@ public void testAzureV3Cloud_whenNoConnectionMethodIsProvided_thenDefaultIsJNLP(
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(vms));
 
-        spotCloud.provision(null, 2);
+        spotCloud.provision((Label)null, 2);
 
         List<Node> allNodes = Jenkins.get().getNodes();
 
@@ -586,9 +596,10 @@ public void testAzureV3Cloud_whenNoConnectionMethodIsProvided_thenDefaultIsJNLP(
     @Test
     public void testGlobalExecutorOverride_whenIsPassedAsNullInCloudConstructor_ThenDefaultIsNotEnabledAndExecutors1() {
         String                     groupId        = "sig-1";
+        String accountId = "act-111";
         SpotGlobalExecutorOverride globalOverride = null;
         BaseSpotinstCloud cloud =
-                new AwsSpotinstCloud(groupId, "", "20", "/tmp", null, null, "", true, null, null, null, null, null,
+                new AwsSpotinstCloud(groupId, "", "20", "/tmp", null, null, "", true, null, null, null, null, accountId,
                                      ConnectionMethodEnum.SSH, getSSHConnector(), false, globalOverride, null);
 
         jenkinsRule.jenkins.clouds.add(cloud);
@@ -632,7 +643,7 @@ public void testGlobalExecutorOverride_whenIsEnabledAndInstanceTypeIsMatchedInEn
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(scaleUpResult));
 
-        cloud.provision(null, 1);
+        cloud.provision((Label)null, 1);
 
         SpotinstSlave agent = (SpotinstSlave) Jenkins.get().getNode(newSpot.getInstanceId());
         assertNotNull(agent);
@@ -673,7 +684,7 @@ public void testGlobalExecutorOverride_whenIsEnabledAndInstanceTypeIsNotMatchedI
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(scaleUpResult));
 
-        cloud.provision(null, 1);
+        cloud.provision((Label)null, 1);
 
         SpotinstSlave agent = (SpotinstSlave) Jenkins.get().getNode(newSpot.getInstanceId());
         assertNotNull(agent);
@@ -720,7 +731,7 @@ null, accountId, ConnectionMethodEnum.SSH, getSSHConnector(), false,
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(scaleUpResult));
 
-        cloud.provision(null, 1);
+        cloud.provision((Label)null, 1);
 
         SpotinstSlave agent = (SpotinstSlave) Jenkins.get().getNode(newSpot.getInstanceId());
         assertNotNull(agent);
@@ -763,7 +774,7 @@ public void testGlobalExecutorOverride_whenIsDisabledAndInstanceTypeIsNotMatched
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(scaleUpResult));
 
-        cloud.provision(null, 1);
+        cloud.provision((Label)null, 1);
 
         SpotinstSlave agent = (SpotinstSlave) Jenkins.get().getNode(newSpot.getInstanceId());
         assertNotNull(agent);
@@ -804,7 +815,7 @@ public void testGlobalExecutorOverride_whenIsDisabledAndInstanceTypeIsMatchedInE
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(scaleUpResult));
 
-        cloud.provision(null, 1);
+        cloud.provision((Label)null, 1);
 
         SpotinstSlave agent = (SpotinstSlave) Jenkins.get().getNode(newSpot.getInstanceId());
         assertNotNull(agent);
@@ -852,7 +863,7 @@ null, accountId, ConnectionMethodEnum.SSH, getSSHConnector(), false,
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(scaleUpResult));
 
-        cloud.provision(null, 1);
+        cloud.provision((Label)null, 1);
 
         SpotinstSlave agent = (SpotinstSlave) Jenkins.get().getNode(newSpot.getInstanceId());
         assertNotNull(agent);
@@ -894,7 +905,7 @@ public void testGlobalExecutorOverride_whenIsInvalidNegativeAndInstanceTypeIsMat
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(scaleUpResult));
 
-        cloud.provision(null, 1);
+        cloud.provision((Label)null, 1);
 
         SpotinstSlave agent = (SpotinstSlave) Jenkins.get().getNode(newSpot.getInstanceId());
         assertNotNull(agent);
@@ -935,7 +946,7 @@ public void testGlobalExecutorOverride_whenIsInvalidNegativeAndInstanceTypeIsNot
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(scaleUpResult));
 
-        cloud.provision(null, 1);
+        cloud.provision((Label)null, 1);
 
         SpotinstSlave agent = (SpotinstSlave) Jenkins.get().getNode(newSpot.getInstanceId());
         assertNotNull(agent);
@@ -983,7 +994,7 @@ null, accountId, ConnectionMethodEnum.SSH, getSSHConnector(), false,
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(scaleUpResult));
 
-        cloud.provision(null, 1);
+        cloud.provision((Label)null, 1);
 
         SpotinstSlave agent = (SpotinstSlave) Jenkins.get().getNode(newSpot.getInstanceId());
         assertNotNull(agent);
@@ -1024,7 +1035,7 @@ public void testGlobalExecutorOverride_whenIsInvalidNullAndInstanceTypeIsMatched
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(scaleUpResult));
 
-        cloud.provision(null, 1);
+        cloud.provision((Label)null, 1);
 
         SpotinstSlave agent = (SpotinstSlave) Jenkins.get().getNode(newSpot.getInstanceId());
         assertNotNull(agent);
@@ -1065,7 +1076,7 @@ public void testGlobalExecutorOverride_whenIsInvalidNullAndInstanceTypeIsNotMatc
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(scaleUpResult));
 
-        cloud.provision(null, 1);
+        cloud.provision((Label)null, 1);
 
         SpotinstSlave agent = (SpotinstSlave) Jenkins.get().getNode(newSpot.getInstanceId());
         assertNotNull(agent);
@@ -1113,7 +1124,7 @@ null, accountId, ConnectionMethodEnum.SSH, getSSHConnector(), false,
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(scaleUpResult));
 
-        cloud.provision(null, 1);
+        cloud.provision((Label)null, 1);
 
         SpotinstSlave agent = (SpotinstSlave) Jenkins.get().getNode(newSpot.getInstanceId());
         assertNotNull(agent);
@@ -1155,7 +1166,7 @@ public void testGlobalExecutorOverride_whenIsNullAndInstanceTypeIsMatchedInEnum_
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(scaleUpResult));
 
-        cloud.provision(null, 1);
+        cloud.provision((Label)null, 1);
 
         SpotinstSlave agent = (SpotinstSlave) Jenkins.get().getNode(newSpot.getInstanceId());
         assertNotNull(agent);
@@ -1195,7 +1206,7 @@ public void testGlobalExecutorOverride_whenIsNullAndInstanceTypeIsNotMatchedInEn
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(scaleUpResult));
 
-        cloud.provision(null, 1);
+        cloud.provision((Label)null, 1);
 
         SpotinstSlave agent = (SpotinstSlave) Jenkins.get().getNode(newSpot.getInstanceId());
         assertNotNull(agent);
@@ -1243,7 +1254,7 @@ null, accountId, ConnectionMethodEnum.SSH, getSSHConnector(), false,
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(scaleUpResult));
 
-        cloud.provision(null, 1);
+        cloud.provision((Label)null, 1);
 
         SpotinstSlave agent = (SpotinstSlave) Jenkins.get().getNode(newSpot.getInstanceId());
         assertNotNull(agent);
@@ -1290,7 +1301,7 @@ public void testSpotinstSlaveTermination_ifAgentInPendingInstances_thenAgentIsRe
                                 .scaleUp(Mockito.anyString(), Mockito.anyInt(), Mockito.anyString()))
                .thenReturn(new ApiResponse<>(scaleUpResult));
 
-        cloud.provision(null, 1);
+        cloud.provision((Label)null, 1);
 
         Boolean detachResult = true;
         Mockito.when(