diff --git a/CHANGELOG.md b/CHANGELOG.md
index 085f549..29b6f48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 ### Added
 
+## [5.5.0] - 2024-10-22
+
+### Changed
+
+- Update to Baselibs 8.7.0
+  - ESMF 8.7.0
+  - FMS 2024.03
+  - HDF5 1.14.5
+  - curl 8.10.1
+  - NCO 5.2.8
+  - CDO 2.4.4
+  - GSL 2.8
+  - jpeg 9f
+  - Various build fixes
+- Move to non-Anaconda GEOSpyD
+
 ## [5.4.1] - 2024-09-18
 
 ### Fixed
diff --git a/g5_modules b/g5_modules
index fc19e7a..c383c97 100644
--- a/g5_modules
+++ b/g5_modules
@@ -132,7 +132,7 @@ if ( $site == NCCS ) then
       set mod3 = comp/intel/2021.6.0
       set mod4 = mpi/impi/2021.6.0
       set mod5 = python/GEOSpyD/Min24.4.0-0_py3.11_AND_Min4.8.3_py2.7
-      set basedir = /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-8.5.0/x86_64-pc-linux-gnu/ifort_2021.6.0-intelmpi_2021.6.0-SLES12
+      set basedir = /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-8.7.0/x86_64-pc-linux-gnu/ifort_2021.6.0-intelmpi_2021.6.0-SLES12
       set usemod1 = /discover/swdev/gmao_SIteam/modulefiles-SLES12
 
    else
@@ -140,8 +140,8 @@ if ( $site == NCCS ) then
       set mod2 = comp/gcc/11.4.0
       set mod3 = comp/intel/2024.2.0
       set mod4 = mpi/impi/2021.13
-      set mod5 = python/GEOSpyD/Min24.4.0-0_py3.11
-      set basedir = /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-8.5.0/x86_64-pc-linux-gnu/ifort_2021.13.0-intelmpi_2021.13.0-SLES15
+      set mod5 = python/GEOSpyD/24.3.0-0/3.11
+      set basedir = /discover/swdev/gmao_SIteam/Baselibs/ESMA-Baselibs-8.7.0/x86_64-pc-linux-gnu/ifort_2021.13.0-intelmpi_2021.13.0-SLES15
       set usemod1 = /discover/swdev/gmao_SIteam/modulefiles-SLES15
 
    endif
@@ -161,12 +161,12 @@ else if ( $site == NAS ) then
 
    set mod1 = GEOSenv
 
-   set basedir = /nobackup/gmao_SIteam/Baselibs/ESMA-Baselibs-8.5.0/x86_64-pc-linux-gnu/ifort_2021.13.0-mpt_2.28_25Apr23_rhel87
+   set basedir = /nobackup/gmao_SIteam/Baselibs/ESMA-Baselibs-8.7.0/x86_64-pc-linux-gnu/ifort_2021.13.0-mpt_2.28_25Apr23_rhel87
    set mod2 = comp-gcc/12.3.0-TOSS4
    set mod3 = comp-intel/2024.2.0-ifort
    set mod4 = mpi-hpe/mpt
 
-   set mod5 = python/GEOSpyD/Min24.4.0-0_py3.11_AND_Min4.8.3_py2.7
+   set mod5 = python/GEOSpyD/24.3.0-0/3.11
 
    set mods = ( $mod1 $mod2 $mod3 $mod4 $mod5 )
    set modinit = /usr/share/modules/init/tcsh
@@ -184,14 +184,14 @@ else if ( $site == NAS ) then
 #=================#
 else if ( $site == GMAO.desktop ) then
 
-   set basedir=/ford1/share/gmao_SIteam/Baselibs/ESMA-Baselibs-8.5.0/x86_64-pc-linux-gnu/ifort_2021.13.0-intelmpi_2021.13
+   set basedir=/ford1/share/gmao_SIteam/Baselibs/ESMA-Baselibs-8.7.0/x86_64-pc-linux-gnu/ifort_2021.13.0-intelmpi_2021.13
 
    set mod1 = GEOSenv
 
    set mod2 = comp/gcc/12.1.0
    set mod3 = comp/intel/2024.2-ifort
    set mod4 = mpi/impi/2021.13
-   set mod5 = other/python/GEOSpyD/Min24.4.0-0_py3.11
+   set mod5 = other/python/GEOSpyD/24.3.0-0/3.11
 
    set mods = ( $mod1 $mod2 $mod3 $mod4 $mod5 )
    set modinit = /usr/share/Modules/init/tcsh
@@ -294,6 +294,37 @@ else
    exit 3
 endif
 
+# add BASEDIR lib to LD_LIBRARY_PATH, if not already there
+#---------------------------------------------------------
+
+if ($useldlibs) then
+   if ($?LD_LIBRARY_PATH) then
+      echo $LD_LIBRARY_PATH | grep $BASEDIR/$arch/lib > /dev/null
+      if ($status) then  #  == 1, if not found
+         setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:$BASEDIR/$arch/lib
+      endif
+   else
+      setenv LD_LIBRARY_PATH $BASEDIR/$arch/lib
+   endif
+
+# add individual $ld_libraries to LD_LIBRARY_PATH, if not already there
+#----------------------------------------------------------------------
+   if ($?ld_libraries) then
+      foreach lib ( $ld_libraries )
+         if ($LD_LIBRARY_PATH !~ *$lib*) then
+            setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:$lib
+         endif
+      end
+   endif
+
+   if ($?LD_LIBRARY64_PATH) then
+      echo $LD_LIBRARY64_PATH | grep $BASEDIR/$arch/lib > /dev/null
+      if ($status) then  #  == 1, if not found
+         setenv LD_LIBRARY64_PATH ${LD_LIBRARY64_PATH}:$BASEDIR/$arch/lib
+      endif
+   endif
+endif
+
 # Set UDUNITS2_XML_PATH
 # ---------------------
 setenv UDUNITS2_XML_PATH $BASEDIR/$arch/share/udunits/udunits2.xml
@@ -326,37 +357,6 @@ if (-e $modinit) then
 endif
 if (! $wrapper) echo " for $node"
 
-# add BASEDIR lib to LD_LIBRARY_PATH, if not already there
-#---------------------------------------------------------
-
-if ($useldlibs) then
-   if ($?LD_LIBRARY_PATH) then
-      echo $LD_LIBRARY_PATH | grep $BASEDIR/$arch/lib > /dev/null
-      if ($status) then  #  == 1, if not found
-         setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:$BASEDIR/$arch/lib
-      endif
-   else
-      setenv LD_LIBRARY_PATH $BASEDIR/$arch/lib
-   endif
-
-# add individual $ld_libraries to LD_LIBRARY_PATH, if not already there
-#----------------------------------------------------------------------
-   if ($?ld_libraries) then
-      foreach lib ( $ld_libraries )
-         if ($LD_LIBRARY_PATH !~ *$lib*) then
-            setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:$lib
-         endif
-      end
-   endif
-
-   if ($?LD_LIBRARY64_PATH) then
-      echo $LD_LIBRARY64_PATH | grep $BASEDIR/$arch/lib > /dev/null
-      if ($status) then  #  == 1, if not found
-         setenv LD_LIBRARY64_PATH ${LD_LIBRARY64_PATH}:$BASEDIR/$arch/lib
-      endif
-   endif
-endif
-
 # write sh commands to a .g5_modules.sh file
 #-------------------------------------------
 if ($wrapper) then