diff --git a/etc/platform-configs/hermit/compiler/cray b/etc/platform-configs/hermit/compiler/cray
index 7c98f53..c73804d 100644
--- a/etc/platform-configs/hermit/compiler/cray
+++ b/etc/platform-configs/hermit/compiler/cray
@@ -1,3 +1,3 @@
 #!/bin/bash
-COMPILER_OPTS="CC=cc CXX=CC FC=ftn F77=tfn"
+COMPILER_OPTS="CC=cc CXX=CC FC=ftn F90=ftn F77=ftn"
 COMPILER_VERSION_CMD="cc -V 2>&1| awk '/Version/{ print \$5; }'"
diff --git a/etc/platform-configs/hermit/compiler/intel b/etc/platform-configs/hermit/compiler/intel
index c0af6aa..7095775 100644
--- a/etc/platform-configs/hermit/compiler/intel
+++ b/etc/platform-configs/hermit/compiler/intel
@@ -1,3 +1,3 @@
 #!/bin/bash
-COMPILER_OPTS="CC=cc CXX=CC FC=ftn F77=tfn"
+COMPILER_OPTS="CC=cc CXX=CC FC=ftn F90=ftn F77=ftn"
 COMPILER_VERSION_CMD="cc -dumpversion"
diff --git a/etc/platform-configs/hermit/compiler/pgi b/etc/platform-configs/hermit/compiler/pgi
index e5c81fd..af3e8a7 100644
--- a/etc/platform-configs/hermit/compiler/pgi
+++ b/etc/platform-configs/hermit/compiler/pgi
@@ -1,3 +1,3 @@
 #!/bin/bash
-COMPILER_OPTS="CC=cc CXX=CC FC=ftn F77=ftn"
+COMPILER_OPTS="CC=cc CXX=CC FC=ftn F90=ftn F77=ftn"
 COMPILER_VERSION_CMD="cc -V 2> /dev/null |  awk '/pgcc/{print \$2}' | sed -e 's/-/./'"
diff --git a/etc/platform-configs/hermit/compiler/system b/etc/platform-configs/hermit/compiler/system
index 918f7db..50913ec 100644
--- a/etc/platform-configs/hermit/compiler/system
+++ b/etc/platform-configs/hermit/compiler/system
@@ -1,3 +1,3 @@
 #!/bin/bash
-COMPILER_OPTS="CC=gcc CXX=g++ FC=gfortran F77=gfortran"
+COMPILER_OPTS="CC=gcc CXX=g++ FC=gfortran F90=gfortran F77=gfortran"
 COMPILER_VERSION_CMD="gcc -dumpversion"
diff --git a/etc/platform-configs/laki/compiler/intel b/etc/platform-configs/laki/compiler/intel
index 630312a..6e419b7 100644
--- a/etc/platform-configs/laki/compiler/intel
+++ b/etc/platform-configs/laki/compiler/intel
@@ -1,3 +1,3 @@
 #!/bin/bash
-COMPILER_OPTS="CC=icc CXX=icpc FC=ifort F77=ifort"
+COMPILER_OPTS="CC=icc CXX=icpc FC=ifort F90=ifort F77=ifort"
 COMPILER_VERSION_CMD="icc -dumpversion"
diff --git a/etc/platform-configs/laki/compiler/pgi b/etc/platform-configs/laki/compiler/pgi
index 4b3e753..4891bef 100644
--- a/etc/platform-configs/laki/compiler/pgi
+++ b/etc/platform-configs/laki/compiler/pgi
@@ -1,3 +1,3 @@
 #!/bin/bash
-COMPILER_OPTS="CC=pgcc CXX=pgCC FC=pgf95 F77=pgf77"
+COMPILER_OPTS="CC=pgcc CXX=pgCC FC=pgf95 F90=pgf90 F77=pgf77"
 COMPILER_VERSION_CMD="pgcc -V |  awk '/pgcc/{print \$2}' | sed -e 's/-/./'"