diff --git a/tasks.yaml b/tasks.yaml
index f926d58d..c887c6cd 100644
--- a/tasks.yaml
+++ b/tasks.yaml
@@ -1,8 +1,8 @@
 includes:
   - cleanup: ./tasks/cleanup.yaml
   - create: ./tasks/create.yaml
-  - deploy: ./tasks/deploy.yaml
-  - setup: ./tasks/setup.yaml
+  - deploy: https://raw.githubusercontent.com/defenseunicorns/uds-common-tasks/v0.2.2/tasks/deploy.yaml
+  - setup: https://raw.githubusercontent.com/defenseunicorns/uds-common-tasks/v0.2.2/tasks/setup.yaml
   - test: ./tasks/test.yaml
 
 tasks:
@@ -19,7 +19,7 @@ tasks:
 
   - name: deploy-package
     actions:
-      - task: deploy:sonarqube-package
+      - task: deploy:package
 
   - name: cleanup
     actions:
@@ -37,7 +37,7 @@ tasks:
 
   - name: deploy-test-bundle
     actions:
-      - task: deploy:sonarqube-test-bundle
+      - task: deploy:test-bundle
 
   - name: test-package
     actions:
diff --git a/tasks/deploy.yaml b/tasks/deploy.yaml
deleted file mode 100644
index fec2273c..00000000
--- a/tasks/deploy.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-tasks:
-  - name: sonarqube-package
-    actions:
-      - description: Deploy the UDS Sonarqube Zarf Package
-        cmd: uds zarf package deploy zarf-package-sonarqube-${UDS_ARCH}-*.tar.zst --confirm --no-progress
-
-  - name: sonarqube-test-bundle
-    actions:
-      - description: Deploy the UDS bundle with Sonarqube and its dependencies
-        cmd: UDS_CONFIG=bundle/uds-config.yaml uds deploy bundle/uds-bundle-sonarqube-test-${UDS_ARCH}-*.tar.zst --confirm --no-progress
diff --git a/tasks/setup.yaml b/tasks/setup.yaml
deleted file mode 100644
index d83377f3..00000000
--- a/tasks/setup.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-  - name: k3d-test-cluster
-    actions:
-      - description: Create k3d cluster with UDS Core
-        cmd: uds deploy oci://defenseunicorns/uds/bundles/k3d-core-istio-dev:0.9.2-${UDS_ARCH} --confirm --no-progress