diff --git a/tasks.yaml b/tasks.yaml
index da514a48..f926d58d 100644
--- a/tasks.yaml
+++ b/tasks.yaml
@@ -13,21 +13,27 @@ tasks:
       - task: setup-cluster
       - task: deploy-test-bundle
 
-  - name: setup-cluster
-    actions:
-      - task: setup:k3d-test-cluster
-  
   - name: create-package
     actions:
       - task: create:sonarqube-package
 
+  - name: deploy-package
+    actions:
+      - task: deploy:sonarqube-package
+
+  - name: cleanup
+    actions:
+      - task: cleanup:destroy
+
+# CI will execute the following (via uds-common/.github/actions/test) so they need to be here with these names
+
   - name: create-test-bundle
     actions:
       - task: create:sonarqube-test-bundle
-  
-  - name: deploy-package
+
+  - name: setup-cluster
     actions:
-      - task: deploy:sonarqube-package
+      - task: setup:k3d-test-cluster
 
   - name: deploy-test-bundle
     actions:
@@ -37,7 +43,3 @@ tasks:
     actions:
       - task: test:health-check
       - task: test:ingress
-
-  - name: cleanup
-    actions:
-      - task: cleanup:destroy