diff --git a/argo/workflow-templates/bluefin-qa-pipeline.yaml b/argo/workflow-templates/bluefin-qa-pipeline.yaml
index 232b04e..62ec2ef 100644
--- a/argo/workflow-templates/bluefin-qa-pipeline.yaml
+++ b/argo/workflow-templates/bluefin-qa-pipeline.yaml
@@ -71,7 +71,7 @@ spec:
           # 3a. Phase 1 — smoke (behave + qecore, every PR)
           - name: run-smoke
             depends: "provision.Succeeded"
-            when: "'{{workflow.parameters.suites}}' contains 'smoke'"
+            when: "'{{workflow.parameters.suites}}' =~ 'smoke'"
             templateRef:
               name: run-gnome-tests
               template: run-gnome-tests
@@ -91,7 +91,7 @@ spec:
           # 3b. Phase 2 — developer tools (sequential after smoke)
           - name: run-developer
             depends: "run-smoke.Succeeded"
-            when: "'{{workflow.parameters.suites}}' contains 'developer'"
+            when: "'{{workflow.parameters.suites}}' =~ 'developer'"
             templateRef:
               name: run-gnome-tests
               template: run-gnome-tests
@@ -111,7 +111,7 @@ spec:
           # 3c. Phase 3 — software management (sequential, only if in suites list)
           - name: run-software
             depends: "run-developer.Succeeded"
-            when: "'{{workflow.parameters.suites}}' contains 'software'"
+            when: "'{{workflow.parameters.suites}}' =~ 'software'"
             templateRef:
               name: run-gnome-tests
               template: run-gnome-tests
diff --git a/argo/workflow-templates/dakota-qa-pipeline.yaml b/argo/workflow-templates/dakota-qa-pipeline.yaml
index b62660b..339145e 100644
--- a/argo/workflow-templates/dakota-qa-pipeline.yaml
+++ b/argo/workflow-templates/dakota-qa-pipeline.yaml
@@ -113,7 +113,7 @@ spec:
           # 5. Run smoke test suite against the provisioned Dakota VM
           - name: run-smoke
             depends: "provision.Succeeded"
-            when: "'{{workflow.parameters.suites}}' contains 'smoke'"
+            when: "'{{workflow.parameters.suites}}' =~ 'smoke'"
             templateRef:
               name: run-gnome-tests
               template: run-gnome-tests
diff --git a/argo/workflow-templates/run-gnome-tests.yaml b/argo/workflow-templates/run-gnome-tests.yaml
index 070a047..0ac04ab 100644
--- a/argo/workflow-templates/run-gnome-tests.yaml
+++ b/argo/workflow-templates/run-gnome-tests.yaml
@@ -4,7 +4,7 @@ metadata:
   name: run-gnome-tests
   namespace: argo
   annotations:
-    bluefin.io/stack: "qecore-headless + behave + dogtail + gnome-ponytail-daemon"
+    bluefin.io/stack: "qecore + behave + dogtail + gnome-ponytail-daemon"
 spec:
   serviceAccountName: argo
   templates: