diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7935344232..d751c10431 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -10,10 +10,12 @@ env:
   CI_GRADLE_ARG_PROPERTIES: >
     -Porg.gradle.jvmargs=-Xmx2g
     -Porg.gradle.parallel=false
-  CI_ANY_MAIN: ${{ github.ref  == 'refs/heads/main' && format('main-{0}', github.sha) }}
-  CI_ANY_DEVELOP: ${{ github.ref  == 'refs/heads/develop' && format('develop-{0}', github.sha) }}
-  CI_ONE_PR: ${{ format('build-debug-{0}-{1}', matrix.target, github.ref) }}
-  CI_GROUP_SUFFIX: ${{ CI_ANY_MAIN || CI_ANY_DEVELOP || CI_ONE_PR }}
+  CI_GROUP_SUFFIX: >
+    ${{
+    github.ref == 'refs/heads/main' && format('main-{0}', github.sha) ||
+    github.ref == 'refs/heads/develop' && format('develop-{0}', github.sha) ||
+    github.ref
+    }}
 jobs:
   debug:
     name: Build debug APKs (${{ matrix.target }})
diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml
index ca024b7be1..13d302ae02 100644
--- a/.github/workflows/integration_tests.yml
+++ b/.github/workflows/integration_tests.yml
@@ -10,18 +10,19 @@ env:
   CI_GRADLE_ARG_PROPERTIES: >
     -Porg.gradle.jvmargs=-Xmx2g
     -Porg.gradle.parallel=false
-  CI_ANY_MAIN: ${{ github.ref  == 'refs/heads/main' && format('main-{0}', github.sha) }}
-  CI_ANY_DEVELOP: ${{ github.ref  == 'refs/heads/develop' && format('develop-{0}', github.sha) }}
-  CI_ONE_PR: ${{ format('build-debug-{0}-{1}', matrix.target, github.ref) }}
-  CI_GROUP_SUFFIX: ${{ CI_ANY_MAIN || CI_ANY_DEVELOP || CI_ONE_PR }}
-
+  CI_GROUP_SUFFIX: >
+    ${{
+    github.ref == 'refs/heads/main' && format('main-{0}', github.sha) ||
+    github.ref == 'refs/heads/develop' && format('develop-{0}', github.sha) ||
+    github.ref
+    }}
 jobs:
   # Build Android Tests [Matrix SDK]
   build-android-test-matrix-sdk:
     name: Matrix SDK - Build Android Tests
     runs-on: ubuntu-latest
     concurrency:
-      group: ${{ format('test-matrix-sdk-{0}', CI_GROUP_SUFFIX) }}
+      group: ${{ format('test-matrix-sdk-{0}', env.CI_GROUP_SUFFIX) }}
       cancel-in-progress: true
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
index 6cfb0d7f05..b8b35de7a7 100644
--- a/.github/workflows/quality.yml
+++ b/.github/workflows/quality.yml
@@ -6,10 +6,12 @@ on:
     branches: [ main, develop ]
 
 env:
-  CI_ANY_MAIN: ${{ github.ref  == 'refs/heads/main' && format('main-{0}', github.sha) }}
-  CI_ANY_DEVELOP: ${{ github.ref  == 'refs/heads/develop' && format('develop-{0}', github.sha) }}
-  CI_ONE_PR: ${{ format('build-debug-{0}-{1}', matrix.target, github.ref) }}
-  CI_GROUP_SUFFIX: ${{ CI_ANY_MAIN || CI_ANY_DEVELOP || CI_ONE_PR }}
+  CI_GROUP_SUFFIX: >
+    ${{
+    github.ref == 'refs/heads/main' && format('main-{0}', github.sha) ||
+    github.ref == 'refs/heads/develop' && format('develop-{0}', github.sha) ||
+    github.ref
+    }}
 
 jobs:
   check:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2ae26e32dd..7a6d19ac92 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -10,10 +10,12 @@ env:
   CI_GRADLE_ARG_PROPERTIES: >
     -Porg.gradle.jvmargs=-Xmx2g
     -Porg.gradle.parallel=false
-  CI_ANY_MAIN: ${{ github.ref  == 'refs/heads/main' && format('main-{0}', github.sha) }}
-  CI_ANY_DEVELOP: ${{ github.ref  == 'refs/heads/develop' && format('develop-{0}', github.sha) }}
-  CI_ONE_PR: ${{ format('build-debug-{0}-{1}', matrix.target, github.ref) }}
-  CI_GROUP_SUFFIX: ${{ CI_ANY_MAIN || CI_ANY_DEVELOP || CI_ONE_PR }}
+  CI_GROUP_SUFFIX: >
+    ${{
+    github.ref == 'refs/heads/main' && format('main-{0}', github.sha) ||
+    github.ref == 'refs/heads/develop' && format('develop-{0}', github.sha) ||
+    github.ref
+    }}
 jobs:
   unit-tests:
     name: Run Unit Tests