diff --git a/.gitmodules b/.gitmodules
index 2f10ad0b3f..4d7675a40d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -32,7 +32,7 @@
   branch = emc/develop
 [submodule "WRFHYDRO"]
   path = WRFHYDRO
-  url = https://github.com/NCAR/wrf_hydro_nwm_public.git
+  url = https://github.com/esmf-org/wrf_hydro_nwm_public.git
   branch = v5.3.0
 [submodule "CDEPS"]
   path = CDEPS-interface/CDEPS
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d82a9c109e..22a31ca5c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules/Modules)
 ###############################################################################
 
 # Valid applications and choices
-list(APPEND VALID_APPS ATM ATMAERO ATMAQ ATMW ATMWM ATML LND S2S S2SA S2SW S2SWA S2SWAL ATM_DS2S ATM_DS2S-PCICE HAFS HAFSW HAFS-MOM6 HAFS-MOM6W HAFS-ALL NG-GODAS)
+list(APPEND VALID_APPS ATM ATMAERO ATMAQ ATMW ATMWM ATML ATMH LND S2S S2SA S2SW S2SWA S2SWAL ATM_DS2S ATM_DS2S-PCICE HAFS HAFSW HAFS-MOM6 HAFS-MOM6W HAFS-ALL NG-GODAS)
 set(APP NONE CACHE BOOL "Application Name")
 if(NOT (APP IN_LIST VALID_APPS))
   message(FATAL_ERROR "${APP} is not a valid application.\nValid Applications are: ${VALID_APPS}")
@@ -157,7 +157,7 @@ if(FMS)
   elseif (APP MATCHES "^(S2S|S2SA|S2SW|S2SWA|S2SWAL|ATM_DS2S|ATM_DS2S-PCICE|NG-GODAS|HAFS-MOM6|HAFS-MOM6W)$")
     add_library(fms ALIAS FMS::fms_r8)
   endif()
-  if(APP MATCHES "^(ATM|ATMAERO|ATMAQ|ATMWM|ATMW|ATML|HAFS|HAFS-ALL)$")
+  if(APP MATCHES "^(ATM|ATMAERO|ATMAQ|ATMWM|ATMW|ATML|ATMH|HAFS|HAFS-ALL)$")
     if(32BIT)
       add_library(fms ALIAS FMS::fms_r4)
     else()
diff --git a/WRFHYDRO b/WRFHYDRO
index 34770b657e..7bebcb3320 160000
--- a/WRFHYDRO
+++ b/WRFHYDRO
@@ -1 +1 @@
-Subproject commit 34770b657e54f0b888bcdf6a5e4d4c01a78458c1
+Subproject commit 7bebcb33209e45fed1067e6d1e8efce6cfc9407d
diff --git a/cmake/configure_apps.cmake b/cmake/configure_apps.cmake
index b6db3a5759..a0c1e325dd 100644
--- a/cmake/configure_apps.cmake
+++ b/cmake/configure_apps.cmake
@@ -13,7 +13,7 @@
 ###############################################################################
 ### Configure Application Components
 ###############################################################################
-if(APP MATCHES "^(ATM|ATMW|ATMWM|ATMAQ|ATML)$")
+if(APP MATCHES "^(ATM|ATMW|ATMWM|ATMAQ|ATML|ATMH)$")
   set(FMS        ON  CACHE BOOL "Enable FMS"                 FORCE)
   set(FV3        ON  CACHE BOOL "Enable FV3"                 FORCE)
   set(STOCH_PHYS ON  CACHE BOOL "Enable Stochastic Physics"  FORCE)
@@ -31,6 +31,9 @@ if(APP MATCHES "^(ATM|ATMW|ATMWM|ATMAQ|ATML)$")
     set(CMEPS    ON  CACHE BOOL "Enable CMEPS"               FORCE)
     set(NOAHMP   ON  CACHE BOOL "Enable NOAHMP"              FORCE)
     message("Configuring UFS app in Atmosphere with Air Quality mode")
+  elseif(APP MATCHES "ATMH")
+    set(WRFHYDRO ON  CACHE BOOL "Enable WRFHYDRO"            FORCE)
+    message("Configuring UFS app in Atmosphere with Hydrology mode")
   else()
     message("Configuring UFS app in Atmosphere Only mode")
   endif()