diff --git a/.github/workflows/run_e2e_tests.yml b/.github/workflows/run_e2e_tests.yml
index ff0bca00..9d789786 100644
--- a/.github/workflows/run_e2e_tests.yml
+++ b/.github/workflows/run_e2e_tests.yml
@@ -97,10 +97,18 @@ jobs:
           files: |
             ${{ inputs.test_report_filename }}
 
+  stop_executor_instances:
+    name: stop test executor instances
+    if: always()
+    uses: ./.github/workflows/run_task.yml
+    with:
+      container_make_target: "terraform/ec2-stop-instances/stop"
+    secrets: inherit
+
   tear_down_test_executor_instances:
     name: Tear down test executor instances
     needs: report_test_results
     uses: ./.github/workflows/run_task.yml
     with:
-      container_make_target: "terraform/ec2-test-executors/clean PRE_RELEASE_NAME=${{ inputs.gh_release_name }}"
+      container_make_target: "terraform/ec2-test-executors/stop PRE_RELEASE_NAME=${{ inputs.gh_release_name }}"
     secrets: inherit
diff --git a/integration-tests/test-suite/lib/waitTimes.js b/integration-tests/test-suite/lib/waitTimes.js
index 3a55b58a..6cce5e63 100644
--- a/integration-tests/test-suite/lib/waitTimes.js
+++ b/integration-tests/test-suite/lib/waitTimes.js
@@ -7,13 +7,13 @@ module.exports = {
    *
    * This is used both for the Logs API (see logsApi.js) and querying NerdGraph (see nerdGraph.js)
    */
-  HTTP_RETRY_COUNT: 3,
+  HTTP_RETRY_COUNT: 1,
 
   /**
    * How long to wait between retrying a query -- either retrying because of an HTTP error (see retryingAxios.js),
    * or because of an error from NerdGraph (see nerdGraph.js)
    */
-  WAIT_BETWEEN_QUERY_RETRIES: 5 * ONE_SECOND,
+  WAIT_BETWEEN_QUERY_RETRIES: 3 * ONE_SECOND,
 
   /**
    * How long it could take our pipeline to process data and get it into NRDB.
diff --git a/integration-tests/test-suite/package.json b/integration-tests/test-suite/package.json
index 0fdfbe56..a10a5dfc 100644
--- a/integration-tests/test-suite/package.json
+++ b/integration-tests/test-suite/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "description": "Validates fluent bit end-to-end with several configurations",
   "scripts": {
-    "test": "jest --verbose"
+    "test": "jest --verbose --runInBand"
   },
   "author": "logging-team@newrelic.com",
   "license": "Apache-2.0",
diff --git a/terraform/ec2-instances-creator/main.tf b/terraform/ec2-instances-creator/main.tf
index 8311ea53..5b0d4ef7 100644
--- a/terraform/ec2-instances-creator/main.tf
+++ b/terraform/ec2-instances-creator/main.tf
@@ -71,4 +71,8 @@ module "ec2_instance" {
     instance_type = var.instance_type
     fb_package_name = each.value.targetPackageName
   })
+}
+
+output "instance_ids" {
+  value = { for k, v in module.ec2_instance : k => v.id }
 }
\ No newline at end of file
diff --git a/terraform/ec2-stop-instances/Makefile b/terraform/ec2-stop-instances/Makefile
new file mode 100644
index 00000000..e965e75c
--- /dev/null
+++ b/terraform/ec2-stop-instances/Makefile
@@ -0,0 +1,7 @@
+# Terraform-stop
+.PHONY: stop
+stop: 
+	terraform init -reconfigure && \
+	terraform refresh
+	aws ec2 stop-instances --region us-east-2 --instance-ids $(terraform output -json instance_ids | jq -r '.[]' | paste -sd ' ' -) ;
+	@echo "EC2 instances stopped."
\ No newline at end of file
diff --git a/terraform/ec2-test-executors/Makefile b/terraform/ec2-test-executors/Makefile
index 0457facb..014440cb 100644
--- a/terraform/ec2-test-executors/Makefile
+++ b/terraform/ec2-test-executors/Makefile
@@ -29,3 +29,13 @@ clean: backend vars generateMatrices
 	terraform destroy -auto-approve -var-file="variables.tfvars"
 	@echo "Removing Terraform backend file ${TERRAFORM_PROJECT}/terraform.backend.tf"
 	@rm "./terraform.backend.tf"
+
+
+# Terraform-stop
+.PHONY: stop
+stop: backend vars generateMatrices
+	terraform init -reconfigure && \
+	terraform apply -auto-approve -var-file="variables.tfvars" && \
+	terraform refresh
+	aws ec2 stop-instances --region us-east-2 --instance-ids $(terraform output -json instance_ids | jq -r '.[]' | paste -sd ' ' -) ;
+	@echo "EC2 instances stopped."
\ No newline at end of file
diff --git a/terraform/outputs.tf b/terraform/outputs.tf
new file mode 100644
index 00000000..795a171d
--- /dev/null
+++ b/terraform/outputs.tf
@@ -0,0 +1,4 @@
+output "instance_ids" {
+  description = "A map of instance IDs created by the ec2_instance module"
+  value       = { for k, v in module.ec2_instance : k => v.id }
+}
\ No newline at end of file
diff --git a/versions/amazonlinux_2.yml b/versions/amazonlinux_2.yml.disabled
similarity index 100%
rename from versions/amazonlinux_2.yml
rename to versions/amazonlinux_2.yml.disabled
diff --git a/versions/amazonlinux_2023.yml b/versions/amazonlinux_2023.yml.disabled
similarity index 100%
rename from versions/amazonlinux_2023.yml
rename to versions/amazonlinux_2023.yml.disabled
diff --git a/versions/centos_7.yml b/versions/centos_7.yml.disabled
similarity index 100%
rename from versions/centos_7.yml
rename to versions/centos_7.yml.disabled
diff --git a/versions/centos_8.yml b/versions/centos_8.yml.disabled
similarity index 100%
rename from versions/centos_8.yml
rename to versions/centos_8.yml.disabled
diff --git a/versions/centos_9.yml b/versions/centos_9.yml.disabled
similarity index 100%
rename from versions/centos_9.yml
rename to versions/centos_9.yml.disabled
diff --git a/versions/debian_10_buster.yml b/versions/debian_10_buster.yml.disabled
similarity index 100%
rename from versions/debian_10_buster.yml
rename to versions/debian_10_buster.yml.disabled
diff --git a/versions/debian_11_bullseye.yml b/versions/debian_11_bullseye.yml.disabled
similarity index 100%
rename from versions/debian_11_bullseye.yml
rename to versions/debian_11_bullseye.yml.disabled
diff --git a/versions/debian_12_bookworm.yml b/versions/debian_12_bookworm.yml.disabled
similarity index 100%
rename from versions/debian_12_bookworm.yml
rename to versions/debian_12_bookworm.yml.disabled
diff --git a/versions/sles_12.1.yml b/versions/sles_12.1.yml.disabled
similarity index 100%
rename from versions/sles_12.1.yml
rename to versions/sles_12.1.yml.disabled
diff --git a/versions/sles_12.2.yml b/versions/sles_12.2.yml.disabled
similarity index 100%
rename from versions/sles_12.2.yml
rename to versions/sles_12.2.yml.disabled
diff --git a/versions/sles_12.3.yml b/versions/sles_12.3.yml.disabled
similarity index 100%
rename from versions/sles_12.3.yml
rename to versions/sles_12.3.yml.disabled
diff --git a/versions/sles_12.4.yml b/versions/sles_12.4.yml.disabled
similarity index 100%
rename from versions/sles_12.4.yml
rename to versions/sles_12.4.yml.disabled
diff --git a/versions/sles_12.5.yml b/versions/sles_12.5.yml.disabled
similarity index 100%
rename from versions/sles_12.5.yml
rename to versions/sles_12.5.yml.disabled
diff --git a/versions/sles_15.1.yml b/versions/sles_15.1.yml.disabled
similarity index 100%
rename from versions/sles_15.1.yml
rename to versions/sles_15.1.yml.disabled
diff --git a/versions/sles_15.2.yml b/versions/sles_15.2.yml.disabled
similarity index 100%
rename from versions/sles_15.2.yml
rename to versions/sles_15.2.yml.disabled
diff --git a/versions/sles_15.3.yml b/versions/sles_15.3.yml.disabled
similarity index 100%
rename from versions/sles_15.3.yml
rename to versions/sles_15.3.yml.disabled
diff --git a/versions/sles_15.4.yml b/versions/sles_15.4.yml.disabled
similarity index 100%
rename from versions/sles_15.4.yml
rename to versions/sles_15.4.yml.disabled
diff --git a/versions/sles_15.5.yml b/versions/sles_15.5.yml.disabled
similarity index 100%
rename from versions/sles_15.5.yml
rename to versions/sles_15.5.yml.disabled
diff --git a/versions/ubuntu_18_bionic.yml b/versions/ubuntu_18_bionic.yml.disabled
similarity index 100%
rename from versions/ubuntu_18_bionic.yml
rename to versions/ubuntu_18_bionic.yml.disabled
diff --git a/versions/ubuntu_20_focal.yml b/versions/ubuntu_20_focal.yml.disabled
similarity index 100%
rename from versions/ubuntu_20_focal.yml
rename to versions/ubuntu_20_focal.yml.disabled
diff --git a/versions/ubuntu_22_jammy.yml b/versions/ubuntu_22_jammy.yml
index db630bec..9f217a27 100644
--- a/versions/ubuntu_22_jammy.yml
+++ b/versions/ubuntu_22_jammy.yml
@@ -3,5 +3,5 @@ osVersion: jammy
 packages:
   - arch: amd64
     ami: ami-03a03b8680a3d588e
-  - arch: arm64
-    ami: ami-0058b7812506d8659
\ No newline at end of file
+  #- arch: arm64
+  #  ami: ami-0058b7812506d8659
\ No newline at end of file
diff --git a/versions/ubuntu_24_noble.yml b/versions/ubuntu_24_noble.yml.disabled
similarity index 100%
rename from versions/ubuntu_24_noble.yml
rename to versions/ubuntu_24_noble.yml.disabled
diff --git a/versions/windows-server-2019.yml b/versions/windows-server-2019.yml.disabled
similarity index 100%
rename from versions/windows-server-2019.yml
rename to versions/windows-server-2019.yml.disabled
diff --git a/versions/windows-server-2022.yml b/versions/windows-server-2022.yml.disabled
similarity index 100%
rename from versions/windows-server-2022.yml
rename to versions/windows-server-2022.yml.disabled