diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4c586061..e66c9f0b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,11 +1,11 @@
 version: 2.1
 
 # Anchors in case we need to override the defaults from the orb
-#baselibs_version: &baselibs_version v8.27.0
-#bcs_version: &bcs_version v11.6.0
+#baselibs_version: &baselibs_version v8.32.0
+#bcs_version: &bcs_version v12.0.0
 
 orbs:
-  ci: geos-esm/circleci-tools@4
+  ci: geos-esm/circleci-tools@5
 
 workflows:
   build-test:
@@ -17,10 +17,12 @@ workflows:
             - docker-hub-creds
           matrix:
             parameters:
-              compiler: [ifort, gfortran]
+              # We cannot currently test with ifx because HDF4 Fortran interface
+              # cannot be compiled with ifx.  The HDF4 Fortran interface is required
+              # for the GEOSldas
+              #compiler: [gfortran, ifort, ifx]
+              compiler: [gfortran, ifort]
           #baselibs_version: *baselibs_version
           repo: GEOSldas
           mepodevelop: false
-          # This is needed due to the LDAS BRIDGE workflow
-          checkout_if_exists: false
           persist_workspace: false # Needs to be true to run fv3/gcm experiment, costs extra
diff --git a/.github/workflows/release-tarball.yml b/.github/workflows/release-tarball.yml
index 2b4a9ceb..98ea3208 100644
--- a/.github/workflows/release-tarball.yml
+++ b/.github/workflows/release-tarball.yml
@@ -10,7 +10,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           path: ${{ github.event.repository.name }}-${{ github.event.release.tag_name }}
 
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
index 6f5f3237..7b648b28 100644
--- a/.github/workflows/workflow.yml
+++ b/.github/workflows/workflow.yml
@@ -15,85 +15,36 @@ on:
       - ".codebuild/**"
       - ".circleci/**"
 
-jobs:
-  build_test_ldas_gnu:
-    name: gfortran / ${{ matrix.cmake-build-type }} / ${{ matrix.cmake-generator }}
-    runs-on: ubuntu-latest
-    container:
-      image: gmao/ubuntu24-geos-env-mkl:v8.27.0-openmpi_5.0.5-gcc_14.2.0
-    strategy:
-      fail-fast: false
-      matrix:
-        cmake-build-type: [Debug, Release]
-        cmake-generator: [Unix Makefiles]
-    env:
-      OMPI_ALLOW_RUN_AS_ROOT: 1
-      OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1
-      OMPI_MCA_btl_vader_single_copy_mechanism: none
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 1
-          filter: blob:none
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/develop' }}
 
-      - name: Build and Test GEOSldas
-        uses: ./.github/actions/ci-build
-        with:
-          cmake-build-type: ${{ matrix.cmake-build-type }}
-          cmake-generator: ${{ matrix.cmake-generator }}
-          fortran-compiler: gfortran
-          extra-cmake-args: -DMPIEXEC_PREFLAGS='--oversubscribe'
-
-  build_test_geosldas_ifort:
-    name: ifort / ${{ matrix.cmake-build-type }} / ${{ matrix.cmake-generator }}
-    runs-on: ubuntu-latest
-    container:
-      image: gmao/ubuntu24-geos-env:v8.27.0-intelmpi_2021.13-ifort_2021.13
+jobs:
+  build_ldas:
     strategy:
       fail-fast: false
       matrix:
-        cmake-build-type: [Debug, Release]
-        cmake-generator: [Unix Makefiles]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 1
-          filter: blob:none
-
-      - name: Build and Test GEOSldas
-        uses: ./.github/actions/ci-build
-        with:
-          cmake-build-type: ${{ matrix.cmake-build-type }}
-          cmake-generator: ${{ matrix.cmake-generator }}
-          fortran-compiler: ifort
+        # We cannot currently test with ifx because HDF4 Fortran interface
+        # cannot be compiled with ifx.  The HDF4 Fortran interface is required
+        # for the GEOSldas
+        #compiler: [ifort, gfortran-15, ifx]
+        compiler: [ifort, gfortran-15]
+        build-type: [Debug]
+    uses: GEOS-ESM/CI-workflows/.github/workflows/geosgcm_build_tests.yml@project/geosgcm
+    with:
+      compiler: ${{ matrix.compiler }}
+      cmake-build-type: ${{ matrix.build-type }}
+      run-mepo-develop: false
 
-  # We cannot currently test with ifx because HDF4 Fortran interface
-  # cannot be compiled with ifx.  The HDF4 Fortran interface is required
-  # for the GEOSldas
-  ################################################################################
-  # build_test_geosldas_ifx:                                                     #
-  #   name: ifx / ${{ matrix.cmake-build-type }} / ${{ matrix.cmake-generator }} #
-  #   runs-on: ubuntu-latest                                                     #
-  #   container:                                                                 #
-  #     image: gmao/ubuntu24-geos-env:v8.27.0-intelmpi_2021.15-ifx_2025.1        #
-  #   strategy:                                                                  #
-  #     fail-fast: false                                                         #
-  #     matrix:                                                                  #
-  #       cmake-build-type: [Debug, Release]                                     #
-  #       cmake-generator: [Unix Makefiles]                                      #
-  #   steps:                                                                     #
-  #     - name: Checkout                                                         #
-  #       uses: actions/checkout@v6                                              #
-  #       with:                                                                  #
-  #         fetch-depth: 1                                                       #
-  #         filter: blob:none                                                    #
-  #                                                                              #
-  #     - name: Build and Test GEOSldas                                          #
-  #       uses: ./.github/actions/ci-build                                       #
-  #       with:                                                                  #
-  #         cmake-build-type: ${{ matrix.cmake-build-type }}                     #
-  #         cmake-generator: ${{ matrix.cmake-generator }}                       #
-  #         fortran-compiler: ifx                                                #
-  ################################################################################
+  # We cannot currently test with spack because spack does not build the
+  # HDF4 Fortran interface, which is required for the GEOSldas.
+  #######################################################################################
+  # spack_build:                                                                        #
+  #   uses: GEOS-ESM/CI-workflows/.github/workflows/spack_gcc_build.yml@project/geosgcm #
+  #   secrets:                                                                          #
+  #     BUILDCACHE_USERNAME: ${{ secrets.BUILDCACHE_USERNAME }}                         #
+  #     BUILDCACHE_TOKEN: ${{ secrets.BUILDCACHE_TOKEN }}                               #
+  #   with:                                                                             #
+  #     load-fms: true                                                                  #
+  #     run-mepo-develop: false                                                         #
+  #######################################################################################
diff --git a/config/GEOSgcm_GridComp_ldas.sparse b/config/GEOSgcm_GridComp_ldas.sparse
index 374ada83..8a558482 100644
--- a/config/GEOSgcm_GridComp_ldas.sparse
+++ b/config/GEOSgcm_GridComp_ldas.sparse
@@ -1,6 +1,5 @@
 /GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp
 /GEOSagcm_GridComp/GEOSphysics_GridComp/CMakeLists.txt
-!/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSlake_GridComp
 !/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSsaltwater_GridComp
 !/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOS_SurfaceGridComp.F90