diff --git a/helm/templates/_scan-crossguard.yaml b/helm/templates/_scan-defectdojo.yaml
similarity index 93%
rename from helm/templates/_scan-crossguard.yaml
rename to helm/templates/_scan-defectdojo.yaml
index 73fce87..0c45ebd 100644
--- a/helm/templates/_scan-crossguard.yaml
+++ b/helm/templates/_scan-defectdojo.yaml
@@ -1,5 +1,5 @@
-{{- define "template.scan-crossguard" }}
-- name: scan-crossguard
+{{- define "template.scan-defectdojo" }}
+- name: scan-defectdojo
       container:
         image: pulumi/pulumi:3.154.0
         env:
diff --git a/helm/templates/clusterworkflowtemplate.yaml b/helm/templates/clusterworkflowtemplate.yaml
index 8aca61e..8308631 100644
--- a/helm/templates/clusterworkflowtemplate.yaml
+++ b/helm/templates/clusterworkflowtemplate.yaml
@@ -89,42 +89,14 @@ spec:
           - name: fail-on-cvss
       dag:
         tasks:
-          - name: trufflehog
-            template: scan-trufflehog
-            arguments:
-              parameters:
-                - name: working-dir
-                  value: "{{inputs.parameters.working-dir}}"
-          - name: semgrep
-            template: scan-semgrep
-            arguments:
-              parameters:
-                - name: working-dir
-                  value: "{{inputs.parameters.working-dir}}"
-          - name: kics
-            template: scan-kics
-            arguments:
-              parameters:
-                - name: working-dir
-                  value: "{{inputs.parameters.working-dir}}"
-          - name: socketdev
-            template: scan-socketdev
-            arguments:
-              parameters:
-                - name: working-dir
-                  value: "{{inputs.parameters.working-dir}}"
-          - name: syft-grype
-            template: scan-syft-grype
-            arguments:
-              parameters:
-                - name: working-dir
-                  value: "{{inputs.parameters.working-dir}}"
-          - name: defectdojo
-            template: scan-crossguard
+          {{- range $scanner := list "trufflehog" "semgrep" "kics" "socketdev" "syft-grype" "defectdojo" }}
+          - name: {{ $scanner }}
+            template: scan-{{ $scanner }}
             arguments:
               parameters:
                 - name: working-dir
                   value: "{{inputs.parameters.working-dir}}"
+          {{- end }}
     - name: sinks-and-enforcement
       container:
         image: curlimages/curl:latest
@@ -140,7 +112,7 @@ spec:
             fi
 {{ include "template.scan-syft-grype" . | indent 4 }}
 {{ include "template.scan-socketdev" . | indent 4 }}
-{{ include "template.scan-crossguard" . | indent 4 }}
+{{ include "template.scan-defectdojo" . | indent 4 }}
 {{ include "template.scan-semgrep" . | indent 4 }}
 {{ include "template.scan-trufflehog" . | indent 4 }}
 {{ include "template.scan-kics" . | indent 4 }}