diff --git a/.github/scripts/symlink_gfortran_mac.sh b/.github/scripts/symlink_gfortran_mac.sh
index bf5933d8..df8a9556 100755
--- a/.github/scripts/symlink_gfortran_mac.sh
+++ b/.github/scripts/symlink_gfortran_mac.sh
@@ -2,7 +2,7 @@
 
 # get full gfortran version string
 # assumes installed via brew as by
-# https://github.com/awvwgk/setup-fortran
+# https://github.com/fortran-lang/setup-fortran
 #
 # sed not head for first line, avoid ruby broken pipe issues
 # (https://stackoverflow.com/a/2845541/6514033)
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 8c84396b..a885a8bc 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -147,7 +147,7 @@ jobs:
           if [[ "$MF6_REMOTE" != "$req_remote" ]]; then exit 1; fi
 
       - name: Setup gfortran
-        uses: awvwgk/setup-fortran@v1
+        uses: fortran-lang/setup-fortran@v1
         with:
           compiler: gcc
           version: 11
diff --git a/.github/workflows/ci_examples.yaml b/.github/workflows/ci_examples.yaml
index b99d696d..8f26a1f4 100644
--- a/.github/workflows/ci_examples.yaml
+++ b/.github/workflows/ci_examples.yaml
@@ -32,7 +32,7 @@ jobs:
         uses: actions/checkout@v2.4.0
 
       - name: Setup gfortran
-        uses: awvwgk/setup-fortran@v1
+        uses: fortran-lang/setup-fortran@v1
         with:
           compiler: gcc
           version: 11