diff --git a/Golden_Repo/e/ESMF/ESMF-6.1.1_libopts.patch b/Golden_Repo/e/ESMF/ESMF-6.1.1_libopts.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0d03f780590a4db90e7626da4e1a12552d6d42e0
--- /dev/null
+++ b/Golden_Repo/e/ESMF/ESMF-6.1.1_libopts.patch
@@ -0,0 +1,11 @@
+--- esmf/build/common.mk.orig	2013-11-26 16:58:50.958274359 +0100
++++ esmf/build/common.mk	2013-11-26 16:59:02.339274158 +0100
+@@ -896,7 +896,7 @@
+ endif
+ ESMF_SL_LIBS_TO_MAKE  = libesmf
+ ESMF_SL_LIBLINKER     = $(ESMF_CXXCOMPILER)
+-ESMF_SL_LIBOPTS      +=
++ESMF_SL_LIBOPTS      += $(ESMF_CXXCOMPILEOPTS)
+ ESMF_SL_LIBLIBS      +=
+ 
+ # - Shared objects
diff --git a/Golden_Repo/e/ESMF/ESMF-8.4.0-intel-para-2022a.eb b/Golden_Repo/e/ESMF/ESMF-8.4.1-intel-para-2022a.eb
similarity index 52%
rename from Golden_Repo/e/ESMF/ESMF-8.4.0-intel-para-2022a.eb
rename to Golden_Repo/e/ESMF/ESMF-8.4.1-intel-para-2022a.eb
index 47de5e24db9b4daee8f0e92482e8297565b4d49b..2c07155636da0dce0f8bc1da9d47e15488386cba 100644
--- a/Golden_Repo/e/ESMF/ESMF-8.4.0-intel-para-2022a.eb
+++ b/Golden_Repo/e/ESMF/ESMF-8.4.1-intel-para-2022a.eb
@@ -1,5 +1,5 @@
 name = 'ESMF'
-version = '8.4.0'
+version = '8.4.1'
 
 homepage = 'https://www.earthsystemcog.org/projects/esmf/'
 description = """The Earth System Modeling Framework (ESMF) is a suite of software tools for developing
@@ -12,7 +12,7 @@ source_urls = ['https://github.com/esmf-org/esmf/archive/']
 sources = ['v%(version)s.tar.gz']
 patches = ['ESMF-6.1.1_libopts.patch']
 checksums = [
-    {'v8.4.0.tar.gz': '28531810bf1ae78646cda6494a53d455d194400f19dccd13d6361871de42ed0f'},
+    {'v8.4.1.tar.gz': '1b54cee91aacaa9df400bd284614cbb0257e175f6f3ec9977a2d991ed8aa1af6'},
     {'ESMF-6.1.1_libopts.patch': '3851627f07c32a7da55d99072d619942bd3a1d9dd002e1557716158e7aacdaf4'},
 ]
 
@@ -23,15 +23,31 @@ dependencies = [
     ('netCDF-Fortran', '4.6.0'),
     ('netCDF-C++4', '4.3.1'),
     ('libarchive', '3.6.1'),
+    ('PnetCDF', '1.12.3'),
 ]
 
+
+# ESMF ignores xxFLAGS
+preconfigopts = 'export ESMF_BOPT="O" && '
+preconfigopts += 'export ESMF_OPTLEVEL="2" && '
+preconfigopts += 'export ESMF_PNETCDF="standard && '
+preconfigopts += 'export ESMF_PNETCDF_INCLUDE=$EBROOTPNETCDF/include && '
+preconfigopts += 'export ESMF_PNETCDF_LIBPATH=$EBROOTPNETCDF/lib && '
+preconfigopts += 'export ESMF_PNETCDF_LIBS=-lpnetcdf && '
+
+preinstallopts = 'export ESMF_CXXLINKOPTS="-lmpifort" && '
+preinstallopts += 'export ESMF_NETCDF_LIBS="$ESMF_NETCDF_LIBS -L${PNETCDF}/lib -lpnetcdf" &&'
+preinstallopts += 'export ESMF_PNETCDF_INCLUDE=$EBROOTPNETCDF/include && '
+preinstallopts += 'export ESMF_PNETCDF_LIBPATH=$EBROOTPNETCDF/lib && '
+preinstallopts += 'export ESMF_PNETCDF_LIBS=-lpnetcdf && '
+
+
 # disable errors from GCC 10 on mismatches between actual and dummy argument lists (GCC 9 behaviour)
-prebuildopts = 'ESMF_F90COMPILEOPTS="${ESMF_F90COMPILEOPTS} -fallow-argument-mismatch"'
+# prebuildopts = 'ESMF_F90COMPILEOPTS="${ESMF_F90COMPILEOPTS} -fallow-argument-mismatch"'
 
 buildopts = 'ESMF_NETCDF_INCLUDE=$EBROOTNETCDFMINFORTRAN/include '
-buildopts += 'ESMF_NETCDF_LIBS="`nc-config --libs` `nf-config --flibs` `ncxx4-config --libs`"'
 
 # too parallel causes the build to become really slow
-maxparallel = 8
+maxparallel = 16
 
 moduleclass = 'geo'