diff --git a/.cirrus.yml b/.cirrus.yml
index a12f726e..8dc9365c 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -66,16 +66,6 @@ npm_cache_definition: &NPM_CACHE
       - npm config set //repox.jfrog.io/artifactory/api/npm/:_authToken=${ARTIFACTORY_ACCESS_TOKEN}
       - npm ci
 
-analyze_definition: &ANALYZE_DEFINITION
-  <<: *CONTAINER_DEFINITION
-  <<: *JS_COVERAGE_CACHE
-  <<: *BUILD_CACHE_DEFINITION
-  <<: *NPM_CACHE
-  depends_on:
-    - build
-  analyze_script:
-    - node ./scripts/ci-analysis.js
-
 build_task:
   <<: *NPM_CACHE
   <<: *BUILD_CACHE_DEFINITION
@@ -85,26 +75,6 @@ build_task:
     - npm run build
     - npm run test
 
-analyze_SQC_EU_task:
-  <<: *ANALYZE_DEFINITION
-  env:
-    SONAR_TOKEN: VAULT[development/kv/data/sonarcloud data.token]
-    SONAR_HOST_URL: https://sonarcloud.io
-
-analyze_next_shadow_task:
-  <<: *ANALYZE_DEFINITION
-  only_if: $CIRRUS_CRON == "nightly"
-  env:
-    SONAR_TOKEN: VAULT[development/kv/data/next data.token]
-    SONAR_HOST_URL: https://next.sonarqube.com/sonarqube
-
-analyze_SQC_US_shadow_task:
-  <<: *ANALYZE_DEFINITION
-  only_if: $CIRRUS_CRON == "nightly"
-  env:
-    SONAR_TOKEN: VAULT[development/kv/data/sonarqube-us data.token]
-    SONAR_HOST_URL: https://sonarqube.us
-
 qa_task:
   depends_on:
     - build
@@ -119,12 +89,37 @@ qa_win_task:
   <<: *INSTANCE_DEFINITION
   <<: *QA_SCRIPT_DEFINITION
 
+analyze_task:
+  alias: analyze
+  <<: *CONTAINER_DEFINITION
+  <<: *JS_COVERAGE_CACHE
+  <<: *BUILD_CACHE_DEFINITION
+  <<: *NPM_CACHE
+  matrix:
+    - name: 'Analyze in Sonarcloud.io'
+      env:
+        SONAR_TOKEN: VAULT[development/kv/data/sonarcloud data.token]
+        SONAR_HOST_URL: https://sonarcloud.io
+    - name: 'Analyze in SQ NEXT'
+      only_if: $CIRRUS_CRON == "nightly"
+      env:
+        SONAR_TOKEN: VAULT[development/kv/data/next data.token]
+        SONAR_HOST_URL: https://next.sonarqube.com/sonarqube
+    - name: 'Analyze in SonarQube.us'
+      only_if: $CIRRUS_CRON == "nightly"
+      env:
+        SONAR_TOKEN: VAULT[development/kv/data/sonarqube-us data.token]
+        SONAR_HOST_URL: https://sonarqube.us
+  depends_on:
+    - build
+  analyze_script:
+    - node ./scripts/ci-analysis.js
+
 run_iris_task:
   <<: *CONTAINER_DEFINITION
   only_if: $CIRRUS_CRON == "nightly"
   depends_on:
-    - analyze_next_shadow
-    - analyze_SQC_US_shadow
+    - analyze
   env:
     SONAR_SOURCE_IRIS_TOKEN: VAULT[development/kv/data/iris data.sqc-eu]
   matrix: