diff --git a/cmake/Modules/FindNETCDF.cmake b/cmake/Modules/FindNETCDF.cmake
index a21f417d3..af721f909 100644
--- a/cmake/Modules/FindNETCDF.cmake
+++ b/cmake/Modules/FindNETCDF.cmake
@@ -9,14 +9,54 @@
 
 # - Finds the NetCDF libraries 
 
+FIND_PATH(NFBIN
+NAMES nf-config
+HINTS 
+   ENV NETCDF_FORTRAN_HOME
+   ENV PATH
+PATH_SUFFIXES
+   bin
+)
+
+IF (NFBIN)
+   SET(CMD "${NFBIN}/nf-config")
+   LIST(APPEND CMD "--includedir")
+   MESSAGE(STATUS "Searching for NetCDF-Fortran include directory using ${CMD}")
+   EXECUTE_PROCESS(COMMAND ${CMD} OUTPUT_VARIABLE NFINCLUDE_DIR ERROR_VARIABLE ERR RESULT_VARIABLE RES OUTPUT_STRIP_TRAILING_WHITESPACE)
+   IF (NFINCLUDE_DIR)
+      MESSAGE(STATUS "Found in ${NFINCLUDE_DIR}")
+   ELSE ()
+      MESSAGE(STATUS "Cannot execute ${CMD}")
+      MESSAGE(STATUS "OUTPUT: ${NFINCLUDE_DIR}")
+      MESSAGE(STATUS "RESULT: ${RES}")
+      MESSAGE(STATUS "ERROR : ${ERR}")
+   ENDIF ()
+
+   SET(CMD "${NFBIN}/nf-config")
+   LIST(APPEND CMD "--prefix")
+   MESSAGE(STATUS "Searching for NetCDF-Fortran library directory using ${CMD}")
+   EXECUTE_PROCESS(COMMAND ${CMD} OUTPUT_VARIABLE NFPREFIX_DIR ERROR_VARIABLE ERR RESULT_VARIABLE RES OUTPUT_STRIP_TRAILING_WHITESPACE)
+   IF (NFPREFIX_DIR)
+      MESSAGE(STATUS "Found in ${NFPREFIX_DIR}")
+   ELSE ()
+      MESSAGE(STATUS "Cannot execute ${CMD}")
+      MESSAGE(STATUS "OUTPUT: ${NFPREFIX_DIR}")
+      MESSAGE(STATUS "RESULT: ${RES}")
+      MESSAGE(STATUS "ERROR : ${ERR}")
+   ENDIF ()
+ENDIF()
+
 FIND_PATH(NETCDF_INCLUDE_DIR 
    NAMES netcdf.mod 
    HINTS 
+      ${NFINCLUDE_DIR}
       ENV NETCDF_INCLUDE_DIR 
       ENV NETCDF_FORTRAN_HOME
       ENV CPATH
    PATH_SUFFIXES
       include
+      modules
+      mod
    REQUIRED
 )
 
@@ -32,6 +72,7 @@ ENDIF()
 FIND_LIBRARY(NETCDF_FORTRAN_LIBRARY 
    NAMES ${NETCDFF} 
    HINTS
+      ${NFPREFIX_DIR}
       ENV NETCDF_FORTRAN_HOME
       ENV NETCDF_HOME
       ENV LD_LIBRARY_PATH
diff --git a/pyproject.toml b/pyproject.toml
index 273cf28c4..9ab8a6efb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,8 +9,8 @@ requires = [
 build-backend = "setuptools.build_meta"
 
 [tool.cibuildwheel.linux]
-environment = {SKBUILD_CONFIGURE_OPTIONS="-DBUILD_SHARED_LIBS=OFF",CPATH="/usr:/usr/local",LD_LIBRARY_PATH="/usr/lib:/usr/lib64:/usr/local/lib:/usr/lib/x86_64-linux-gnu:/usr/lib/aarch64-linux-gnu"}
+environment = {SKBUILD_CONFIGURE_OPTIONS="-DBUILD_SHARED_LIBS=OFF"}
 before-all = [
-    "yum install netcdf-fortran-static netcdf-static hdf5-static -y",
+    "yum install netcdf-fortran-static netcdf-static hdf5-static -y"
 ]
     
\ No newline at end of file