diff --git a/modulefiles/module-setup.csh.inc b/modulefiles/module-setup.csh.inc
index 3a0bcdd772..cf63d4464a 100644
--- a/modulefiles/module-setup.csh.inc
+++ b/modulefiles/module-setup.csh.inc
@@ -47,6 +47,13 @@ else if ( { test -L /usrx && sh -c "readlink /usrx 2> /dev/null | grep dell" } )
         source /usrx/local/prod/lmod/lmod/init/$__ms_shell
     endif
     module purge
+else if ( { test -d /lfs/h2 } ) then
+    # We are on NOAA Cactus or Dogwood
+    if ( ! { module help >& /dev/null } ) then
+        source /usr/share/lmod/lmod/init/$__ms_shell
+    fi
+    module purge
+    module load envvar/1.0
 else if ( { test -d /glade } ) then
     # We are on NCAR Yellowstone
     if ( ! { module help >& /dev/null } ) then
diff --git a/modulefiles/module-setup.sh.inc b/modulefiles/module-setup.sh.inc
index 75c7249ea4..b1cdd45111 100644
--- a/modulefiles/module-setup.sh.inc
+++ b/modulefiles/module-setup.sh.inc
@@ -63,6 +63,14 @@ elif [[ -L /usrx && "$( readlink /usrx 2> /dev/null )" =~ dell ]] ; then
 	source /usrx/local/prod/lmod/lmod/init/$__ms_shell
     fi
     module purge
+elif [[ -d /lfs/h2 ]] ; then
+    # We are on NOAA Cactus or Dogwood
+    if ( ! eval module help > /dev/null 2>&1 ) ; then
+        echo load the module command 1>&2
+        source /usr/share/lmod/lmod/init/$__ms_shell
+    fi
+    module purge
+    module load envvar/1.0
 elif [[ -d /glade ]] ; then
     # We are on NCAR Yellowstone
     if ( ! eval module help > /dev/null 2>&1 ) ; then