diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index c69f70c0452..1e48f432d1b 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -207,8 +207,8 @@ jobs:
         id: build-test-matrix-list
         run: |
           cd ./integration-tests
-          MATRIX_JSON_AUTOMATION=$(./scripts/buildTestMatrixList.sh ./smoke/automation_test.go automation ubuntu20.04-4cores-16GB 1)
-          MATRIX_JSON_KEEPER=$(./scripts/buildTestMatrixList.sh ./smoke/keeper_test.go keeper ubuntu20.04-4cores-16GB 1)
+          MATRIX_JSON_AUTOMATION=$(./scripts/buildTestMatrixList.sh ./smoke/automation_test.go automation ubuntu-latest 1)
+          MATRIX_JSON_KEEPER=$(./scripts/buildTestMatrixList.sh ./smoke/keeper_test.go keeper ubuntu-latest 1)
           COMBINED_ARRAY=$(jq -c -n "$MATRIX_JSON_AUTOMATION + $MATRIX_JSON_KEEPER")
 
           # if we running a PR against the develop branch we should only run the automation tests unless we are in the merge group event
@@ -324,15 +324,15 @@ jobs:
             pyroscope_env: ""
           - name: ocr
             nodes: 1
-            os: ubuntu20.04-4cores-16GB
+            os: ubuntu-latest
             pyroscope_env: ci-smoke-ocr-evm-simulated
           - name: ocr2
             nodes: 1
-            os: ubuntu20.04-4cores-16GB
+            os: ubuntu20.04-8cores-32GB
             pyroscope_env: ci-smoke-ocr2-evm-simulated
           - name: ocr2
             nodes: 1
-            os: ubuntu20.04-4cores-16GB
+            os: ubuntu20.04-8cores-32GB
             pyroscope_env: ci-smoke-ocr2-evm-simulated
             tag_suffix: "-plugins"
           - name: runlog
@@ -341,23 +341,23 @@ jobs:
             pyroscope_env: ""
           - name: vrf
             nodes: 1
-            os: ubuntu20.04-4cores-16GB
+            os: ubuntu-latest
             pyroscope_env: ci-smoke-vrf-evm-simulated
           - name: vrfv2
             nodes: 1
-            os: ubuntu20.04-4cores-16GB
+            os: ubuntu-latest
             pyroscope_env: ci-smoke-vrf2-evm-simulated
           - name: vrfv2plus
             nodes: 1
-            os: ubuntu20.04-4cores-16GB
+            os: ubuntu-latest
             pyroscope_env: ci-smoke-vrf2plus-evm-simulated
           - name: forwarder_ocr
             nodes: 1
-            os: ubuntu20.04-4cores-16GB
+            os: ubuntu-latest
             pyroscope_env: ci-smoke-forwarder-ocr-evm-simulated
           - name: forwarders_ocr2
             nodes: 1
-            os: ubuntu20.04-4cores-16GB
+            os: ubuntu-latest
             pyroscope_env: ci-smoke-forwarder-ocr-evm-simulated
     runs-on: ${{ matrix.product.os }}
     name: ETH Smoke Tests ${{ matrix.product.name }}${{ matrix.product.tag_suffix }}
diff --git a/integration-tests/smoke/automation_test.go_test_list.json b/integration-tests/smoke/automation_test.go_test_list.json
index 25e921b93ca..da214a0d282 100644
--- a/integration-tests/smoke/automation_test.go_test_list.json
+++ b/integration-tests/smoke/automation_test.go_test_list.json
@@ -2,7 +2,7 @@
   "tests": [
     {
       "name": "TestAutomationBasic",
-      "label": "ubuntu20.04-16cores-64GB",
+      "label": "ubuntu-latest",
       "nodes": 6
     },
     {
@@ -10,42 +10,42 @@
     },
     {
       "name": "TestAutomationAddFunds",
-      "label": "ubuntu20.04-16cores-64GB",
+      "label": "ubuntu-latest",
       "nodes": 2
     },
     {
       "name": "TestAutomationPauseUnPause",
-      "label": "ubuntu20.04-8cores-32GB",
+      "label": "ubuntu-latest",
       "nodes": 2
     },
     {
       "name": "TestAutomationRegisterUpkeep",
-      "label": "ubuntu20.04-8cores-32GB",
+      "label": "ubuntu-latest",
       "nodes": 2
     },
     {
       "name": "TestAutomationPauseRegistry",
-      "label": "ubuntu20.04-8cores-32GB",
+      "label": "ubuntu-latest",
       "nodes": 2
     },
     {
       "name": "TestAutomationKeeperNodesDown",
-      "label": "ubuntu20.04-8cores-32GB",
+      "label": "ubuntu-latest",
       "nodes": 2
     },
     {
       "name": "TestAutomationPerformSimulation",
-      "label": "ubuntu20.04-8cores-32GB",
+      "label": "ubuntu-latest",
       "nodes": 2
     },
     {
       "name": "TestAutomationCheckPerformGasLimit",
-      "label": "ubuntu20.04-16cores-64GB",
+      "label": "ubuntu-latest",
       "nodes": 2
     },
     {
       "name": "TestUpdateCheckData",
-      "label": "ubuntu20.04-16cores-64GB",
+      "label": "ubuntu-latest",
       "nodes": 2
     }
   ]
diff --git a/integration-tests/smoke/keeper_test.go_test_list.json b/integration-tests/smoke/keeper_test.go_test_list.json
index 0404fba3299..b2f4aa00659 100644
--- a/integration-tests/smoke/keeper_test.go_test_list.json
+++ b/integration-tests/smoke/keeper_test.go_test_list.json
@@ -2,42 +2,42 @@
   "tests": [
     {
       "name": "TestKeeperBasicSmoke",
-      "label": "ubuntu20.04-16cores-64GB",
+      "label": "ubuntu-latest",
       "nodes": 3
     },
     {
       "name": "TestKeeperBlockCountPerTurn",
-      "label": "ubuntu20.04-16cores-64GB",
+      "label": "ubuntu-latest",
       "nodes": 3
     },
     {
       "name": "TestKeeperSimulation",
-      "label": "ubuntu20.04-8cores-32GB",
+      "label": "ubuntu-latest",
       "nodes": 2
     },
     {
       "name": "TestKeeperCheckPerformGasLimit",
-      "label": "ubuntu20.04-8cores-32GB",
+      "label": "ubuntu-latest",
       "nodes": 3
     },
     {
       "name": "TestKeeperRegisterUpkeep",
-      "label": "ubuntu20.04-8cores-32GB",
+      "label": "ubuntu-latest",
       "nodes": 3
     },
     {
       "name": "TestKeeperAddFunds",
-      "label": "ubuntu20.04-8cores-32GB",
+      "label": "ubuntu-latest",
       "nodes": 3
     },
     {
       "name": "TestKeeperRemove",
-      "label": "ubuntu20.04-16cores-64GB",
+      "label": "ubuntu-latest",
       "nodes": 3
     },
     {
       "name": "TestKeeperPauseRegistry",
-      "label": "ubuntu20.04-8cores-32GB",
+      "label": "ubuntu-latest",
       "nodes": 2
     },
     {
@@ -45,7 +45,7 @@
     },
     {
       "name": "TestKeeperNodeDown",
-      "label": "ubuntu20.04-16cores-64GB",
+      "label": "ubuntu-latest",
       "nodes": 3
     },
     {