diff --git a/modulefiles/rdbfmsua_wcoss2.intel.lua b/modulefiles/rdbfmsua_wcoss2.intel.lua
index e1551110..fa6ab142 100644
--- a/modulefiles/rdbfmsua_wcoss2.intel.lua
+++ b/modulefiles/rdbfmsua_wcoss2.intel.lua
@@ -31,6 +31,6 @@ load(pathJoin("bacio", bacio_ver))
 load(pathJoin("w3emc", w3emc_ver))
 load(pathJoin("gempak", gempak_ver))
 
-setenv("gfortran_ROOT", "//opt/cray/pe/gcc/10.3.0/snos")
+setenv("gfortran_ROOT", "/opt/cray/pe/gcc/10.3.0/snos")
 
 whatis("Description: GFS utilities environment on WCOSS2 with Intel Compilers")
diff --git a/src/rdbfmsua.fd/makefile.hera.intel b/src/rdbfmsua.fd/makefile.hera.intel
index c63b2ec1..983584e8 100644
--- a/src/rdbfmsua.fd/makefile.hera.intel
+++ b/src/rdbfmsua.fd/makefile.hera.intel
@@ -1,7 +1,5 @@
 FC = ifort
 
-GFORTRAN=/apps/gcc/6.2.0/lib64
-
 FFLAGS = -g -traceback -I${GEMPAK}/include -I${OS_INC}
 LIBS = ${BUFR_LIB4} \
        ${GEMLIB}/gemlib.a \
@@ -9,4 +7,4 @@ LIBS = ${BUFR_LIB4} \
        ${GEMLIB}/syslib.a \
        ${GEMLIB}/cgemlib.a \
        ${GEMLIB}/bridge.a \
-       -L${GFORTRAN} -lgfortran
+       -L${gfrortran_ROOT}/lib64 -lgfortran
diff --git a/src/rdbfmsua.fd/makefile.wcoss2.intel b/src/rdbfmsua.fd/makefile.wcoss2.intel
index 5dc8d88c..4b256cbc 100644
--- a/src/rdbfmsua.fd/makefile.wcoss2.intel
+++ b/src/rdbfmsua.fd/makefile.wcoss2.intel
@@ -1,9 +1,7 @@
 FC = ftn
 
-GFORTRAN=/opt/cray/pe/gcc/10.3.0/snos/lib64/libgfortran.a
-
 FFLAGS = -g -traceback -I${GEMINC} -I${OS_INC}
 LIBS = ${BUFR_LIB4} \
        -L${GEMOLB} -lgemlib -lappl -lsyslib -lcgemlib \
        ${GEMOLB}/libbridge.a \
-       ${GFORTRAN}
+       ${gfortran_ROOT}/lib64/libgfortran.a