diff --git a/.github/workflows/compile_mex.yml b/.github/workflows/compile_mex.yml
index a9112e7ad0..055c896652 100644
--- a/.github/workflows/compile_mex.yml
+++ b/.github/workflows/compile_mex.yml
@@ -90,15 +90,13 @@ jobs:
               GFVER=9
           fi
           echo "GFVER=$GFVER" >> $GITHUB_ENV
-
       - name: Set up gfortran on Linux
         if: startsWith(matrix.os, 'ubuntu')
         uses: fortran-lang/setup-fortran@main
         with:
           compiler: gcc
           version: ${{ env.GFVER }}
-
-      - name: Check gfortran version
+      - name: Check gfortran version on Linux
         if: startsWith(matrix.os, 'ubuntu')
         run: which gfortran && gfortran --version
 
diff --git a/.github/workflows/verify_archiva.yml b/.github/workflows/verify_archiva.yml
index 0da6b368a7..893ff8f797 100644
--- a/.github/workflows/verify_archiva.yml
+++ b/.github/workflows/verify_archiva.yml
@@ -81,9 +81,15 @@ jobs:
           repository: matcutest/matcutest_compiled
           path: matcutest
 
-      - name: Link gfortran for MATLAB on Linux
+      - name: Set up gfortran on Linux
         if: startsWith(matrix.os, 'ubuntu')
-        run: bash .github/scripts/link_gfortran ${{ env.GFORTRAN_VERSION }}
+        uses: fortran-lang/setup-fortran@main
+        with:
+          compiler: gcc
+          version: ${{ env.GFORTRAN_VERSION }}
+      - name: Check gfortran version on Linux
+        if: startsWith(matrix.os, 'ubuntu')
+        run: which gfortran && gfortran --version
 
       - name: Check MATLAB
         id: check_matlab