diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6a13c060..a22472dc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,14 +41,23 @@ jobs:
           - "conda"
           - "docker"
           - "singularity"
-        isMaster:
-          - ${{ github.base_ref == 'master' }}
-        # Exclude conda and singularity on dev
-        exclude:
-          - isMaster: false
-            compute_profile: "conda"
-          - isMaster: false
-            compute_profile: "singularity"
+        test_profile:
+          - "test_stub"
+          - "test_build_stub"
+      include:
+        - test_profile: "test_cosmic"
+          if: ${{ secrets.COSMIC_USERNAME && secrets.COSMIC_PASSWD }}
+        - test_profile: "test"
+          if: ${{ secrets.COSMIC_USERNAME && secrets.COSMIC_PASSWD }}
+        - test_profile: "test_build"
+          if: ${{ secrets.COSMIC_USERNAME && secrets.COSMIC_PASSWD }}
+      exclude:
+        - compute_profile: "conda"
+          test_profile: "test_cosmic"
+        - compute_profile: "conda"
+          test_profile: "test"
+        - compute_profile: "conda"
+          test_profile: "test_build"
     steps:
       - name: Check out pipeline code
         uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
@@ -102,19 +111,11 @@ jobs:
         with:
           version: ${{ env.NFT_VER }}
 
-      - name: Set test profile based on secrets
-        run: |
-          if [ -n "${{ secrets.COSMIC_USERNAME }}" ] && [ -n "${{ secrets.COSMIC_PASSWD }}" ]; then
-            echo "test_profile=test_cosmic,test,test_build" >> $GITHUB_ENV
-          else
-            echo "test_profile=test_stub,test_build_stub" >> $GITHUB_ENV
-          fi
-
-      - name: Run Tests (${{matrix.NXF_VER}} | ${{test_profile}} | ${{matrix.compute_profile}})
+      - name: Run Tests (${{ matrix.NXF_VER }} | ${{ matrix.test_profile }} | ${{ matrix.compute_profile }})
         run: |
           nf-test test \
               --ci \
-              --tag ${{test_profile}} \
+              --tag ${{ matrix.test_profile }} \
               --profile "+${{ matrix.compute_profile }}" \
               --junitxml=test.xml \
               --debug --verbose