diff --git a/src/authservice/validate.yaml b/src/authservice/tasks.yaml
similarity index 86%
rename from src/authservice/validate.yaml
rename to src/authservice/tasks.yaml
index 850eaec5a..e3b314c9b 100644
--- a/src/authservice/validate.yaml
+++ b/src/authservice/tasks.yaml
@@ -1,5 +1,5 @@
 tasks:
-  - name: run
+  - name: validate
     actions:
       - description: Validate...
         cmd: "echo Replace Me"
diff --git a/src/grafana/validate.yaml b/src/grafana/tasks.yaml
similarity index 92%
rename from src/grafana/validate.yaml
rename to src/grafana/tasks.yaml
index a7f1307f4..a305b7457 100644
--- a/src/grafana/validate.yaml
+++ b/src/grafana/tasks.yaml
@@ -1,5 +1,5 @@
 tasks:
-  - name: run
+  - name: validate
     actions:
       - description: Validate grafana is up
         wait:
diff --git a/src/istio/pepr/istio-job-termination.ts b/src/istio/pepr/istio-job-termination.ts
index 940e13b07..0b318e164 100644
--- a/src/istio/pepr/istio-job-termination.ts
+++ b/src/istio/pepr/istio-job-termination.ts
@@ -15,12 +15,11 @@ When(a.Pod)
   .WithLabel("batch.kubernetes.io/job-name")
   .WithLabel("service.istio.io/canonical-name")
   .Watch(async pod => {
-    if (!pod.metadata?.name || !pod.metadata.namespace ) {
+    if (!pod.metadata?.name || !pod.metadata.namespace) {
       Log.error(pod, `Invalid Pod definition`);
       return;
     }
 
-
     const { name, namespace } = pod.metadata;
     const key = `${namespace}/${name}`;
 
diff --git a/src/istio/validate.yaml b/src/istio/tasks.yaml
similarity index 96%
rename from src/istio/validate.yaml
rename to src/istio/tasks.yaml
index 332a36aba..a41c5ec03 100644
--- a/src/istio/validate.yaml
+++ b/src/istio/tasks.yaml
@@ -1,5 +1,5 @@
 tasks:
-  - name: run
+  - name: validate
     actions:
       - description: Validate the Istio Admin Gateway
         wait:
diff --git a/src/neuvector/validate.yaml b/src/keycloak/tasks.yaml
similarity index 86%
rename from src/neuvector/validate.yaml
rename to src/keycloak/tasks.yaml
index 850eaec5a..e3b314c9b 100644
--- a/src/neuvector/validate.yaml
+++ b/src/keycloak/tasks.yaml
@@ -1,5 +1,5 @@
 tasks:
-  - name: run
+  - name: validate
     actions:
       - description: Validate...
         cmd: "echo Replace Me"
diff --git a/src/kiali/validate.yaml b/src/kiali/tasks.yaml
similarity index 86%
rename from src/kiali/validate.yaml
rename to src/kiali/tasks.yaml
index 850eaec5a..e3b314c9b 100644
--- a/src/kiali/validate.yaml
+++ b/src/kiali/tasks.yaml
@@ -1,5 +1,5 @@
 tasks:
-  - name: run
+  - name: validate
     actions:
       - description: Validate...
         cmd: "echo Replace Me"
diff --git a/src/loki/validate.yaml b/src/loki/tasks.yaml
similarity index 95%
rename from src/loki/validate.yaml
rename to src/loki/tasks.yaml
index 3700856db..38a92a71d 100644
--- a/src/loki/validate.yaml
+++ b/src/loki/tasks.yaml
@@ -1,5 +1,5 @@
 tasks:
-  - name: run
+  - name: validate
     actions:
       - description: Validate loki
         wait:
diff --git a/src/metrics-server/validate.yaml b/src/metrics-server/tasks.yaml
similarity index 95%
rename from src/metrics-server/validate.yaml
rename to src/metrics-server/tasks.yaml
index 7561e98d1..610223eaf 100644
--- a/src/metrics-server/validate.yaml
+++ b/src/metrics-server/tasks.yaml
@@ -1,5 +1,5 @@
 tasks:
-  - name: run
+  - name: validate
     actions:
       - description: Wait for metrics-server pod(s) to be ready
         wait:
diff --git a/src/keycloak/validate.yaml b/src/neuvector/tasks.yaml
similarity index 86%
rename from src/keycloak/validate.yaml
rename to src/neuvector/tasks.yaml
index 850eaec5a..e3b314c9b 100644
--- a/src/keycloak/validate.yaml
+++ b/src/neuvector/tasks.yaml
@@ -1,5 +1,5 @@
 tasks:
-  - name: run
+  - name: validate
     actions:
       - description: Validate...
         cmd: "echo Replace Me"
diff --git a/src/policies/validate.yaml b/src/policies/tasks.yaml
similarity index 78%
rename from src/policies/validate.yaml
rename to src/policies/tasks.yaml
index 4aa5d8a9c..6f8456bb0 100644
--- a/src/policies/validate.yaml
+++ b/src/policies/tasks.yaml
@@ -1,4 +1,4 @@
 tasks:
-  - name: run
+  - name: validate
     actions:
       - cmd: "npx jest src/policies/**/*.spec.ts"
diff --git a/src/prometheus-stack/validate.yaml b/src/prometheus-stack/tasks.yaml
similarity index 97%
rename from src/prometheus-stack/validate.yaml
rename to src/prometheus-stack/tasks.yaml
index 6d575c764..f5bff3447 100644
--- a/src/prometheus-stack/validate.yaml
+++ b/src/prometheus-stack/tasks.yaml
@@ -1,5 +1,5 @@
 tasks:
-  - name: run
+  - name: validate
     actions:
       - description: Validate alert manager
         wait:
diff --git a/src/promtail/validate.yaml b/src/promtail/tasks.yaml
similarity index 92%
rename from src/promtail/validate.yaml
rename to src/promtail/tasks.yaml
index 23658d5f3..e6b07898c 100644
--- a/src/promtail/validate.yaml
+++ b/src/promtail/tasks.yaml
@@ -1,5 +1,5 @@
 tasks:
-  - name: run
+  - name: validate
     actions:
       - description: Validate promail
         wait:
diff --git a/src/tempo/tasks.yaml b/src/tempo/tasks.yaml
new file mode 100644
index 000000000..e3b314c9b
--- /dev/null
+++ b/src/tempo/tasks.yaml
@@ -0,0 +1,7 @@
+tasks:
+  - name: validate
+    actions:
+      - description: Validate...
+        cmd: "echo Replace Me"
+        # wait:
+        #   cluster:
diff --git a/src/tempo/validate.yaml b/src/tempo/validate.yaml
deleted file mode 100644
index 850eaec5a..000000000
--- a/src/tempo/validate.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-  - name: run
-    actions:
-      - description: Validate...
-        cmd: "echo Replace Me"
-        # wait:
-        #   cluster:
diff --git a/src/test/validate.yaml b/src/test/tasks.yaml
similarity index 98%
rename from src/test/validate.yaml
rename to src/test/tasks.yaml
index 84c00d18e..38d7a1c9d 100644
--- a/src/test/validate.yaml
+++ b/src/test/tasks.yaml
@@ -1,5 +1,5 @@
 tasks:
-  - name: run
+  - name: validate
     description: Test app used for UDS Core validation
     actions:
       - description: Apply the test resources
diff --git a/src/velero/tasks.yaml b/src/velero/tasks.yaml
new file mode 100644
index 000000000..e3b314c9b
--- /dev/null
+++ b/src/velero/tasks.yaml
@@ -0,0 +1,7 @@
+tasks:
+  - name: validate
+    actions:
+      - description: Validate...
+        cmd: "echo Replace Me"
+        # wait:
+        #   cluster:
diff --git a/src/velero/validate.yaml b/src/velero/validate.yaml
deleted file mode 100644
index 850eaec5a..000000000
--- a/src/velero/validate.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-  - name: run
-    actions:
-      - description: Validate...
-        cmd: "echo Replace Me"
-        # wait:
-        #   cluster:
diff --git a/tasks/test.yaml b/tasks/test.yaml
index d8e1d4fa6..18c38c5b5 100644
--- a/tasks/test.yaml
+++ b/tasks/test.yaml
@@ -12,7 +12,7 @@ tasks:
       - task: deploy:single-package
 
       - description: "Validate the package"
-        cmd: uds run -f src/${UDS_PKG}/validate.yaml run --no-progress
+        cmd: uds run -f src/${UDS_PKG}/tasks.yaml validate --no-progress
 
   - name: uds-core
     description: "Build and test UDS Core"
@@ -27,5 +27,5 @@ tasks:
         cmd: |
           set -e        
           for package in src/*; do
-            uds run -f ${package}/validate.yaml run --no-progress
+            uds run -f ${package}/tasks.yaml validate --no-progress
           done