diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2cf7f0b0c..22a23cd69 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ macos-14, macos-15, macos-15-intel, macos-26, macos-26-intel, ubuntu-24.04 ]
+        os: [ macos-14, macos-15, macos-15-intel, macos-26, macos-26-intel, ubuntu-24.04, ubuntu-26.04-arm ]
         compiler: [ gfortran ]
         version: [ 13, 14, 15, 16 ]
         extra_flags: [ -g -O3 ]
@@ -60,6 +60,10 @@ jobs:
             container: snowstep/llvm:ubuntu-22.04-latest
 
           # https://hub.docker.com/r/phhargrove/llvm-flang/tags
+          - os: ubuntu-24.04
+            compiler: flang
+            version: 23
+            container: phhargrove/llvm-flang:23.1.0_rc2-latest
           - os: ubuntu-24.04
             compiler: flang
             version: 22
@@ -162,7 +166,7 @@ jobs:
         sudo apt-get update
         #sudo apt list -a 'gfortran-*'
         sudo apt install -y build-essential
-        if [[ ${COMPILER_VERSION} -lt 15 ]] ; then
+        if [[ ${COMPILER_VERSION} -lt 15 ]] || type -p gfortran-${COMPILER_VERSION} ; then
           sudo apt install -y gfortran-${COMPILER_VERSION}
         else
           curl -L https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh -o install-homebrew.sh
@@ -244,15 +248,16 @@ jobs:
         fi
 
     - name: Setup FPM
+      if: ${{ !(runner.os == 'Linux' && runner.arch == 'ARM64') }}
       uses: fortran-lang/setup-fpm@main
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         fpm-version: latest
 
     - name: Build FPM
-      if: false
+      if: ${{ runner.os == 'Linux' && runner.arch == 'ARM64' }}
       run: |
-        export FPM_VERSION=0.12.0
+        export FPM_VERSION=0.13.0
         curl --retry 5 -LOsS https://github.com/fortran-lang/fpm/releases/download/v$FPM_VERSION/fpm-$FPM_VERSION.F90
         mkdir fpm-temp
         gfortran-14 -o fpm-temp/fpm fpm-$FPM_VERSION.F90