diff --git a/pom.xml b/pom.xml
index 066d81450..445299fbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.version>3.13.0</maven.compiler.version>
 
-        <active-support.version>2.5.6</active-support.version>
+        <active-support.version>2.5.7</active-support.version>
         <api-calls.version>2.7.1</api-calls.version>
         <uri-constructor.version>2.0.6</uri-constructor.version>
 
@@ -243,13 +243,12 @@
                 <configuration>
                     <skip>true</skip>
                     <testFailureIgnore>true</testFailureIgnore>
-                    <forkCount>3</forkCount>
-                    <argLine>-Xmx${jvmMemory}m</argLine>                    <includes>
+                    <argLine>-Xmx${jvmMemory}m</argLine>
+                    <includes>
                     <include>**/**.java</include>
                     </includes>
-                    <parallel>methods</parallel>
-                    <threadCount>4</threadCount>
-                    <reuseForks>true</reuseForks>
+                    <parallel>suites</parallel>
+                    <threadCount>5</threadCount>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/src/test/java/org/dvsa/testing/framework/pageObjects/BasePage.java b/src/test/java/org/dvsa/testing/framework/pageObjects/BasePage.java
index 70f07e35e..5d6bdec14 100644
--- a/src/test/java/org/dvsa/testing/framework/pageObjects/BasePage.java
+++ b/src/test/java/org/dvsa/testing/framework/pageObjects/BasePage.java
@@ -28,7 +28,7 @@
 import static org.openqa.selenium.support.ui.ExpectedConditions.*;
 
 public abstract class BasePage extends DriverUtils {
-    public static final int WAIT_TIME_SECONDS = 5;
+    public static final int WAIT_TIME_SECONDS = 7;
     private static final int TIME_OUT_SECONDS = 60;
     private static final int POLLING_SECONDS = 2;
     private static final Logger LOGGER = LogManager.getLogger(BasePage.class);
diff --git a/src/test/java/org/dvsa/testing/framework/stepdefs/vol/TestRunConfiguration.java b/src/test/java/org/dvsa/testing/framework/stepdefs/vol/TestRunConfiguration.java
index e1b8fd3c5..6ded79fa0 100644
--- a/src/test/java/org/dvsa/testing/framework/stepdefs/vol/TestRunConfiguration.java
+++ b/src/test/java/org/dvsa/testing/framework/stepdefs/vol/TestRunConfiguration.java
@@ -37,5 +37,6 @@ public void tearDown(Scenario scenario) throws Exception {
         if (Browser.isBrowserOpen()) {
             Browser.closeBrowser();
         }
+        Browser.removeLocalDriverThread();
     }
 }
\ No newline at end of file
diff --git a/src/test/resources/org/dvsa/testing/framework/features/SelfServe/EBSR/non-prod/ebsr.feature b/src/test/resources/org/dvsa/testing/framework/features/SelfServe/EBSR/non-prod/ebsr.feature
index f077efe7e..a11dfea2f 100644
--- a/src/test/resources/org/dvsa/testing/framework/features/SelfServe/EBSR/non-prod/ebsr.feature
+++ b/src/test/resources/org/dvsa/testing/framework/features/SelfServe/EBSR/non-prod/ebsr.feature
@@ -2,7 +2,7 @@
 Feature: import EBSR for English, Welsh and Scottish Areas
 
   @ss_regression @FullRegression @printAndSign
-  Scenario Outline: Short notice import EBSR in self-serve (Resource-A)
+  Scenario Outline: Short notice import EBSR in self-serve
     Given I have a psv application with traffic area "<Area>" and enforcement area "<Area>" which has been granted
     When I upload an ebsr file with "<Days>" days notice
     Then A short notice flag should be displayed in selfserve
@@ -16,7 +16,7 @@ Feature: import EBSR for English, Welsh and Scottish Areas
       | west       | 41   |
 
   @ss_regression @FullRegression @printAndSign
-  Scenario Outline: import EBSR in self-serve (Resource-B)
+  Scenario Outline: import EBSR in self-serve
     Given I have a psv application with traffic area "<Area>" and enforcement area "<Area>" which has been granted
     When I upload an ebsr file with "<Days>" days notice
     Then A short notice flag should not be displayed in selfserve
@@ -41,8 +41,8 @@ Feature: import EBSR for English, Welsh and Scottish Areas
       | north_east | 41   | curtail       |
       | wales      | 55   | suspend       |
 
-  @ec2_smoke
-  Scenario: Short notice import EBSR in self-serve smoke test (Resource-B)
+
+  Scenario: Short notice import EBSR in self-serve smoke test
     Given I have a psv application with traffic area "west" and enforcement area "west" which has been granted
 #    When i trigger the ebsr process queue
     When I upload an ebsr file with "41" days notice
@@ -50,13 +50,13 @@ Feature: import EBSR for English, Welsh and Scottish Areas
     And Documents are generated
 
   @ebsrsmoketest @localsmoke
-  Scenario: import EBSR in self-serve smoke test (Resource-B)
+  Scenario: import EBSR in self-serve smoke test
     Given I have a psv application with traffic area "west" and enforcement area "west" which has been granted
     When I upload an ebsr file with "42" days notice
     Then A short notice flag should not be displayed in selfserve
     And Documents are generated
 
-  @ec2_smoke
+
   Scenario: import EBSR for curtailed and suspended licence in self-serve smoke test (Resource-B)
     Given I have a psv application with traffic area "north_east" and enforcement area "north_east" which has been granted
     And the licence status is "curtail"