diff --git a/.github/workflows/containerized-ci.yml b/.github/workflows/containerized-ci.yml
index c8fd7d6b10..00d947b90b 100644
--- a/.github/workflows/containerized-ci.yml
+++ b/.github/workflows/containerized-ci.yml
@@ -24,6 +24,8 @@ jobs:
           image: ghcr.io/earth-system-radiation/rte-rrtmgp-ci:oneapi
         - compiler: ifx
           image: ghcr.io/earth-system-radiation/rte-rrtmgp-ci:oneapi
+        # Common variables
+        - kgo_version: v002
     container:
       image: ${{ matrix.image }}
     env:
@@ -35,7 +37,7 @@ jobs:
       # KGO tests variables
       ATOL: 0.0
       RTOL: 0.0
-      KGO_VERSION: v002
+      KGO_VERSION: ${{ matrix.kgo_version }}
       GDKGO1: ${{ matrix.gdkgo1 }}
       GDKGO2: ${{ matrix.gdkgo2 }}
     steps:
@@ -123,7 +125,7 @@ jobs:
           python plot_test_outputs.py --tst_file=$TST_MLEV
         fi
         cd data/outputs/UKMO
-        tar --ignore-failed-read -czf outputs.UKMO.tgz cosp2_output.um_global.nc \
+        tar --ignore-failed-read -czf outputs.${{ matrix.compiler }}.UKMO.tgz cosp2_output.um_global.nc \
           cosp2_output_um.nc cosp2_output.um_global_model_levels.nc *.png \
           cosp2_output.um_global.out
         ls -lh
@@ -134,5 +136,5 @@ jobs:
       if: failure()
       uses: actions/upload-artifact@v4.3.1
       with:
-        name: outputs.UKMO.tgz
-        path: driver/data/outputs/UKMO/outputs.UKMO.tgz
+        name: outputs.${{ matrix.compiler }}.UKMO.tgz
+        path: driver/data/outputs/UKMO/outputs.${{ matrix.compiler }}.UKMO.tgz
diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
index db5810b636..94ec231412 100644
--- a/.github/workflows/continuous_integration.yml
+++ b/.github/workflows/continuous_integration.yml
@@ -39,6 +39,9 @@ jobs:
       matrix:
         compiler: [gfortran-10, gfortran-11, gfortran-12]
         python-version: [3.11]
+        include:
+          - compiler_short_name: gfortran
+          - kgo_version: v002
     defaults:
       run:
         shell: bash -el {0}
@@ -49,11 +52,11 @@ jobs:
       NFHOME: /usr
       ATOL: 0.0
       RTOL: 0.0
-      KGO_VERSION: v002
+      KGO_VERSION: ${{ matrix.kgo_version }}
       GDKGO1: https://docs.google.com/uc?export=download&id=11dKcIL3EQr7s6jbo4f9GsoW0SufesGbq
       GDKGO2: https://docs.google.com/uc?export=download&id=1s5Ha6Hqnv_hWbRUs8KQpJ4Lxy8uvJDar
       GDKGO3: https://docs.google.com/uc?export=download&id=1kY1lRgzd0UhDiQef2u-VgTQql_iut3U2
-      F90_SHORT_NAME: gfortran
+      F90_SHORT_NAME: ${{ matrix.compiler_short_name }}
     # Sequence of tasks that will be executed as part of the job
     steps:
     ###############################################################################
@@ -176,7 +179,7 @@ jobs:
           python plot_test_outputs.py --tst_file=$TST_MLEV
         fi
         cd data/outputs/UKMO
-        tar --ignore-failed-read -czf outputs.UKMO.tgz cosp2_output.um_global.nc \
+        tar --ignore-failed-read -czf outputs.${{ matrix.compiler }}.UKMO.tgz cosp2_output.um_global.nc \
           cosp2_output_um.nc cosp2_output.um_global_model_levels.nc *.png \
           cosp2_output.um_global.out
         ls -lh
@@ -187,5 +190,5 @@ jobs:
       if: failure()
       uses: actions/upload-artifact@v4.3.1
       with:
-        name: outputs.UKMO.tgz
-        path: driver/data/outputs/UKMO/outputs.UKMO.tgz
+        name: outputs.${{ matrix.compiler }}.UKMO.tgz
+        path: driver/data/outputs/UKMO/outputs.${{ matrix.compiler }}.UKMO.tgz