diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 12a99d7d7..eb4bc5542 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -21,20 +21,24 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-24.04, macos-latest, windows-2022]
-        compiler: [gfortran-12, gfortran-13]
-        use-conda-compiler: [true, false]
         fpmodel: [DP, SP]
         # Conda does not contain gfortran-10/11/12 for windows
-        exclude:
-          - os: windows-2022
-            compiler: gfortran-12
-          - os: windows-2022
+        include: 
+          - os: ubuntu-24.04
             use-conda-compiler: false
+            compiler: [gfortran-12, gfortran-13]
+            use-conda-compiler: [true, false]
+
+          - os: windows-2022
+            compiler: gfortran-13
+            use-conda-compiler: true
 
           - os: macos-latest
-            use-conda-compiler: false
+            compiler: gfortran-13
+            use-conda-compiler: true
 
-          - os: ubuntu-22.04
+        exclude:
+          - os: ubuntu-24.04
             use-conda-compiler: false
             compiler: gfortran-13
     env: