diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index d210874..4bf0546 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -38,18 +38,18 @@ jobs:
             use_oasis: "False",
             model_opts: "--eCLM --PDAF"
           }
-#        - {
-#            name: "CLM3.5-ParFlow-PDAF",
-#            use_oasis: "True",
-#            parflow_dir: "parflow_pdaf",
-#            model_opts: "--CLM35 --ParFlow --PDAF"
-#          }
-#        - {
-#            name: "eCLM-ParFlow-PDAF",
-#            use_oasis: "True",
-#            parflow_dir: "parflow_pdaf",
-#            model_opts: "--eCLM --ParFlow --PDAF"
-#         }
+        - {
+            name: "CLM3.5-ParFlow-PDAF",
+            use_oasis: "True",
+            parflow_dir: "parflow_pdaf",
+            model_opts: "--CLM35 --ParFlow --PDAF"
+          }
+        - {
+            name: "eCLM-ParFlow-PDAF",
+            use_oasis: "True",
+            parflow_dir: "parflow_pdaf",
+            model_opts: "--eCLM --ParFlow --PDAF"
+          }
     env:
       SYSTEMNAME: UBUNTU
       STAGE: 24.04
diff --git a/.gitmodules b/.gitmodules
index fc4a845..e93625e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,11 +9,11 @@
 [submodule "models/parflow_pdaf"]
 	path = models/parflow_pdaf
 	url = https://github.com/HPSCTerrSys/parflow
-	branch = tsmp-pdaf-patched-openmp-flag-fix
+	branch = tsmp-pdaf-patched-pdaf-CI
 [submodule "models/pdaf"]
 	path = models/pdaf
 	url = https://github.com/HPSCTerrSys/pdaf.git
-	branch = tsmp-pdaf-patched-TSMP2
+	branch = tsmp-pdaf-patched-eclm-pfl-fixes
 [submodule "models/eCLM"]
 	path = models/eCLM
 	url = https://github.com/HPSCTerrSys/eCLM.git
diff --git a/cmake/BuildParFlow.cmake b/cmake/BuildParFlow.cmake
index 708e14a..44e947e 100644
--- a/cmake/BuildParFlow.cmake
+++ b/cmake/BuildParFlow.cmake
@@ -6,6 +6,7 @@ if(DEFINED eCLM_SRC)
 elseif(DEFINED CLM35_SRC)
     list(APPEND PF_CLM_FLAGS -DPARFLOW_AMPS_LAYER=oas3
                              -DOAS3_ROOT=${OASIS_ROOT}
+			     -DPARFLOW_HAVE_ECLM=ON # Experimental: CLM35 should have own flag
                              -DPARFLOW_HAVE_CLM=OFF)
 else()
     # use ParFlow's internal CLM
@@ -41,7 +42,12 @@ endif()
 # Set compiler flags
 if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
     # Flags were based from https://github.com/parflow/parflow/blob/c8aa8d7140db19153194728b8fa9136b95177b6d/.github/workflows/linux.yml#L486
-    set(PF_CFLAGS "-Wall -Werror -Wno-unused-result -Wno-unused-function -Wno-stringop-overread")
+    if(${PDAF})
+      # PDAF: add `-Wno-unused-variable`
+      set(PF_CFLAGS "-Wall -Werror -Wno-unused-result -Wno-unused-function -Wno-unused-variable -Wno-stringop-overread")
+    else()
+      set(PF_CFLAGS "-Wall -Werror -Wno-unused-result -Wno-unused-function -Wno-stringop-overread")
+    endif()
     # Silence arch-specific compiler warnings
     if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64|aarch64")
       string(APPEND PF_CFLAGS " -Wno-maybe-uninitialized")
diff --git a/models/pdaf b/models/pdaf
index 924736e..8171094 160000
--- a/models/pdaf
+++ b/models/pdaf
@@ -1 +1 @@
-Subproject commit 924736ef334873f6fcf315c49c1d3f3695313d38
+Subproject commit 81710946b7fc9618af79e228ff5a8b2815a2fa18