diff --git a/.github/workflows/cross-cloud-tests.yaml b/.github/workflows/cross-cloud-tests.yaml
index d814c1218..af04eacd7 100644
--- a/.github/workflows/cross-cloud-tests.yaml
+++ b/.github/workflows/cross-cloud-tests.yaml
@@ -70,8 +70,7 @@ jobs:
     strategy:
       matrix:
         cloud-provider: [aks] # Add or remove providers as needed [TODO: later add -> eks + gke]
-    env:
-      TEST_SCENARIO: multi-apps
+        test-scenario: [multi-apps] # Add or remove scenarios as needed
 
     steps:
 
@@ -162,7 +161,7 @@ jobs:
         run: |
           echo "MODE=cross-cloud-tests" >> $GITHUB_ENV
           export MODE=cross-cloud-tests
-          chainsaw test tests/e2e/${{ env.TEST_SCENARIO }}
+          chainsaw test tests/e2e/${{ matrix.test-scenario }}
 
       # - name: Destroy Resources
       #   if: always()  # Ensures this runs even if earlier steps fail
diff --git a/tests/e2e/multi-apps/tracesql/resource-attributes.yaml b/tests/e2e/multi-apps/tracesql/resource-attributes.yaml
index 934439b7e..f6b56aef5 100644
--- a/tests/e2e/multi-apps/tracesql/resource-attributes.yaml
+++ b/tests/e2e/multi-apps/tracesql/resource-attributes.yaml
@@ -6,9 +6,9 @@ description: |
   B. Kubernetes attributes are correctly set on all spans
   At the time of writing this test, TraceQL api does not support not equal to nil so we use regex instead.
 query: |
-    { resource.odigos.version != "e2e-test" ||
+    { resource.odigos.version !~ ".*" ||
       resource.k8s.deployment.name !~ ".*" ||
-      resource.k8s.node.name !~ "kind-control-plane" ||
+      resource.k8s.node.name !~ "(kind-control-plane|aks-.*)" ||
       resource.k8s.pod.name !~ ".*" }
 expected:
   count: 0
\ No newline at end of file