diff --git a/Externals.cfg b/Externals.cfg
index b24a41cc1c..84664b96f5 100644
--- a/Externals.cfg
+++ b/Externals.cfg
@@ -3,7 +3,7 @@ protocol = git
 repo_url = https://github.com/NOAA-GSL/regional_workflow
 # Specify either a branch name or a hash but not both.
 #branch = feature/RRFS_dev1
-hash = da620e0
+hash = b7387a8
 local_path = regional_workflow
 required = True
 
@@ -21,7 +21,7 @@ protocol = git
 repo_url = https://github.com/NOAA-GSL/ufs-weather-model
 # Specify either a branch name or a hash but not both.
 #branch = RRFS_dev
-hash = b63bbbe
+hash = 23cb7d7
 local_path = src/ufs_weather_model
 required = True
 
@@ -30,7 +30,7 @@ protocol = git
 repo_url = https://github.com/NOAA-GSL/UPP
 # Specify either a branch name or a hash but not both.
 #branch = RRFS_dev
-hash = be58699
+hash = 170dbb4
 local_path = src/EMC_post
 required = True
 
@@ -46,9 +46,8 @@ protocol = git
 repo_url = https://github.com/NOAA-GSL/GSI.git
 # Specify either a branch name or a hash but not both.
 #branch = feature/rrfs_dev
-hash = f734149
+hash = 79eb624
 local_path = src/gsi
-externals = ../../Externals_gsi.cfg
 required = True
 
 [rrfs_utl]
@@ -56,7 +55,7 @@ protocol = git
 repo_url = https://github.com/NOAA-GSL/rrfs_utl.git
 # Specify either a branch name or a hash but not both.
 # branch = develop
-hash = 3730b65
+hash = 1ae44c2
 local_path = src/rrfs_utl
 required = True
 
diff --git a/Externals_gsi.cfg b/Externals_gsi.cfg
deleted file mode 100644
index 8013635413..0000000000
--- a/Externals_gsi.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-[externals_description]
-schema_version = 1.1.0
-
-[ncdiag]
-protocol = git
-required = True
-from_submodule = True
diff --git a/env/srw_common b/env/srw_common
index 451566a7de..4a1066925c 100644
--- a/env/srw_common
+++ b/env/srw_common
@@ -30,6 +30,7 @@ module load w3emc/2.9.2
 module load wgrib2/2.0.8
 module load ncio/1.0.0
 module load wrf_io/1.2.0
+module load ncdiag/1.0.0
 
 module load bacio/2.4.1
 module load nemsio/2.5.2