diff --git a/.github/workflows/test-aks.yaml b/.github/workflows/test-aks.yaml
index c7f6fa119..ff9a2dba7 100644
--- a/.github/workflows/test-aks.yaml
+++ b/.github/workflows/test-aks.yaml
@@ -1,12 +1,13 @@
 # Copyright 2024 Defense Unicorns
 # SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial
 
-name: AKS Nightly Test
+name: AKS Test
 
 on:
   schedule:
-    - cron: '0 6 * * *' # Runs at midnight Mountain every day
+    - cron: '0 0 * * 0' # Every Sunday Midnight (UTC) / Saturday 5pm MT
   pull_request:
+    types: [milestoned, opened, reopened, synchronize]
     paths:
       - tasks/iac.yaml
       - .github/bundles/aks/*
diff --git a/.github/workflows/test-eks.yaml b/.github/workflows/test-eks.yaml
index 338a1e299..c0b0cfe59 100644
--- a/.github/workflows/test-eks.yaml
+++ b/.github/workflows/test-eks.yaml
@@ -1,12 +1,13 @@
 # Copyright 2024 Defense Unicorns
 # SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial
 
-name: EKS Nightly Test
+name: EKS Test
 
 on:
   schedule:
-    - cron: '0 6 * * *' # Runs at midnight Mountain every day
+    - cron: '0 0 * * 0' # Every Sunday Midnight (UTC) / Saturday 5pm MT
   pull_request:
+    types: [milestoned, opened, reopened, synchronize]
     paths:
       - tasks/iac.yaml
       - .github/bundles/eks/*
diff --git a/.github/workflows/test-rke2.yaml b/.github/workflows/test-rke2.yaml
index db196031a..2187658f6 100644
--- a/.github/workflows/test-rke2.yaml
+++ b/.github/workflows/test-rke2.yaml
@@ -1,12 +1,13 @@
 # Copyright 2024 Defense Unicorns
 # SPDX-License-Identifier: AGPL-3.0-or-later OR LicenseRef-Defense-Unicorns-Commercial
 
-name: RKE2 Nightly Test
+name: RKE2 Test
 
 on:
   schedule:
-    - cron: '0 6 * * *' # Runs at midnight Mountain every day
+    - cron: '0 0 * * 0' # Every Sunday Midnight (UTC) / Saturday 5pm MT
   pull_request:
+    types: [milestoned, opened, reopened, synchronize]
     paths:
       - tasks/iac.yaml
       - .github/bundles/rke2/*
diff --git a/tasks/iac.yaml b/tasks/iac.yaml
index cadf35fc7..7eec9f854 100644
--- a/tasks/iac.yaml
+++ b/tasks/iac.yaml
@@ -115,7 +115,7 @@ tasks:
 
           # wait for cluster components
           while true; do
-            if [ $(uds zarf tools kubectl get po -A --no-headers=true | egrep -v 'Running|Completed' | wc -l) -gt 0 ]; then
+            if [ $(uds zarf tools kubectl get po,job -A --no-headers=true | egrep -v 'Running|Complete' | wc -l) -gt 0 ]; then
               echo "Waiting for cluster components to be ready...";
               sleep 5;
             else