diff --git a/.github/workflows/Fortran.yml b/.github/workflows/Fortran.yml
index 3a7548b2f..a12deecb2 100644
--- a/.github/workflows/Fortran.yml
+++ b/.github/workflows/Fortran.yml
@@ -2,7 +2,7 @@ name: Grid and Mesh Solver
 on: [push]
 
 env:
-  PETSC_VERSION: '3.20.5'
+  PETSC_VERSION: '3.21.0'
   HOMEBREW_NO_ANALYTICS: 'ON'     # Make Homebrew installation a little quicker
   HOMEBREW_NO_AUTO_UPDATE: 'ON'
   HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 'ON'
@@ -67,7 +67,7 @@ jobs:
         run: |
           cd petsc-${PETSC_VERSION}
           ./configure --with-fc=gfortran --with-cc=gcc --with-cxx=g++ \
-          --download-openmpi --download-fftw --download-hdf5 --download-hdf5-fortran-bindings=1 --download-zlib \
+          --download-openmpi --download-fftw --download-hdf5 --with-hdf5-fortran-bindings=1 --download-zlib \
           --with-mpi-f90module-visibility=1
           make all
 
@@ -128,7 +128,7 @@ jobs:
       - name: PETSc - Prepare
         run: |
           tar -xf download/petsc-${PETSC_VERSION}.tar.gz -C .
-          sed -i "1800s/if not os.path.isfile(os.path.join(self.packageDir,self.configureName)):/if True:/g" \
+          sed -i "1802s/if not os.path.isfile(os.path.join(self.packageDir,self.configureName)):/if True:/g" \
           ./petsc-${PETSC_VERSION}/config/BuildSystem/config/package.py
           export PETSC_DIR=${PWD}/petsc-${PETSC_VERSION}
           export PETSC_ARCH=intel
@@ -143,14 +143,21 @@ jobs:
 
       - name: PETSc - Install
         run: |
+          mpiifx -show
           cd petsc-${PETSC_VERSION}
           ./configure \
           --with-fc=mpiifx \
           --with-cc=mpiicx \
           --with-cxx=mpiicpx \
-          --download-fftw --download-hdf5 --download-hdf5-fortran-bindings=1 --download-zlib
+          --download-fftw --download-hdf5 --with-hdf5-fortran-bindings=1 --download-zlib
           make all
 
+      - name: PETSc - Save log
+        uses: actions/upload-artifact@v4
+        with:
+          name: configure.log
+          path: petsc-${PETSC_VERSION}/configure.log
+
       - name: DAMASK - Compile
         run: |
           cmake -B build/grid -DDAMASK_SOLVER=grid -DCMAKE_INSTALL_PREFIX=${PWD}