diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf b/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf
index 4a5781385c..184c67e660 100644
--- a/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf
+++ b/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.conf
@@ -96,23 +96,24 @@ EXEC	"rtstats -h rtstats.unidata.ucar.edu"
 #REQUEST	LIGHTNING	".*"	idd.unidata.ucar.edu
 # NLDN (Restricted Access)
 #REQUEST	LIGHTNING	".*"	striker.atmos.albany.edu
-REQUEST NEXRAD3 "./p(DHR|DPR|DSP|DTA|DAA|DVL|EET|HHC|N0K|N0C|N0X|N0Q|N0S|N0U|OHA|NVW|NTV|NST)." idd.unidata.ucar.edu
+REQUEST NEXRAD3 "./p(DHR|DPR|DSP|DTA|DAA|HHC|N0Q|N0S|N0U|OHA)." idd.unidata.ucar.edu
 REQUEST FNEXRAD|IDS|DDPLUS|UNIWISC ".*" idd.unidata.ucar.edu
 REQUEST NGRID ".*" idd.unidata.ucar.edu
 REQUEST NOTHER "^TIP... KNES.*" idd.unidata.ucar.edu
 REQUEST HDS|NIMAGE ".*" idd.unidata.ucar.edu
 REQUEST CONDUIT "nam"   idd.unidata.ucar.edu
-REQUEST CONDUIT "rap"   idd.unidata.ucar.edu
 # Global GFS
 REQUEST CONDUIT "pgrb2" idd.unidata.ucar.edu
 # NDFD
 REQUEST CONDUIT "nwstg" idd.unidata.ucar.edu
 # GOES-16(R) Experimental/Provisional
 REQUEST NOTHER "^TI[RS]... KNES.*" idd.unidata.ucar.edu
-# FNMOC
-REQUEST FNMOC ".*" idd.unidata.ucar.edu
 # CMC
 REQUEST CMC ".*" idd.unidata.ucar.edu
+# Uncomment for RAP40
+#REQUEST CONDUIT "rap"   idd.unidata.ucar.edu
+# FNMOC
+#REQUEST FNMOC ".*" idd.unidata.ucar.edu
 # FSL/GSD HRRR sub-hourly
 #REQUEST FSL2 "^GRIB2.FSL.HRRR" hrrr.unidata.ucar.edu
 # NSSL MRMS (Restricted Access)
diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf
index 51f666ad08..759b201f21 100644
--- a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf
+++ b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf
@@ -113,16 +113,32 @@ IDS|DDPLUS	^(W[CSV]PN0[1-6]) (KKCI) (..)(..)(..)
 ANY	^([PQ][A-Z0-9]{3,5}) (....) (..)(..)(..) !redbook [^/]*/([^/]*)/([^/]*)/([^/]*)/([0-9]{8})
 	FILE	-overwrite -close -edex	/awips2/data_store/redbook/\4\5Z_\8_\7_\6-\1_\2.rb
 #
-# NOAAPORT GINI images
+# NOAAPORT GINI images - All sectors
 #
-NIMAGE	^(sat[^/]*)/ch[0-9]/([^/]*)/([^/]*)/([^ ]*) ([^/]*)/([^/]*)/([^/]*)/ (T[^ ]*) ([^ ]*) (..)(..)(..)
-	FILE	-overwrite -close -edex	/awips2/data_store/sat/\(11)\(12)Z_\3_\7_\6-\8_\9.satz.gini
+#NIMAGE	^(sat[^/]*)/ch[0-9]/([^/]*)/([^/]*)/([^ ]*) ([^/]*)/([^/]*)/([^/]*)/ (T[^ ]*) ([^ ]*) (..)(..)(..)
+#	FILE	-overwrite -close -edex	/awips2/data_store/sat/\(11)\(12)Z_\3_\7_\6-\8_\9.satz.gini
 #
-# GOES-16(R) experimental/provisional products
+# NOAAPORT GINI images - CONUS, NH, COMP sectors
 #
-NOTHER	^(TI[RS]...) (KNES) (......) (...)
-	FILE	-close -edex
-	/awips2/data_store/satellite/goes16/\1_\2_\3_\4_(seq).gini
+NIMAGE  ^(sat[^/]*)/ch[0-9]/([^/]*)/([^/]*)/([^ ]*) ([^/]*)/([^/]*)/([^/]*)/ (TI.[EFNW]..) ([^ ]*) (..)(..)(..)
+        FILE    -overwrite -close -edex /awips2/data_store/sat/\(11)\(12)Z_\3_\7_\6-\8_\9.satz.gini
+
+#
+# GOES-16(R) experimental/provisional products - large-scale non-mesoscale sectors
+#
+NOTHER  ^(TIR[CU]..) (KNES) (......) (...)
+        FILE    -close -edex
+        /awips2/data_store/satellite/goes16/\1_\2_\3_\4_(seq).gini
+# A=Alaska, H=Hawaii, P=Puerto Rico
+#NOTHER ^(TIR[AHP]..) (KNES) (......) (...)
+#       FILE    -close -edex
+#       /awips2/data_store/satellite/goes16/\1_\2_\3_\4_(seq).gini
+#
+# GOES-16(R) experimental/provisional products - mesoscale sectors
+#
+#NOTHER ^(TIS...) (KNES) (......) (...)
+#       FILE    -close -edex
+#       /awips2/data_store/satellite/goes16/\1_\2_\3_\4_(seq).gini
 #
 # GOES-16(R) Derived
 #
@@ -628,9 +644,9 @@ HDS	^[YZ].U... KWB. [0-3][0-9][0-2][0-9].*/m(ETA|NAM) !grib.*/([0-9]{8})([0-9]{4
 #
 # NamDNG 2.5 km NGRID (NamDNG)
 #
-NGRID	^[LM].I... KWBE ...... !grib2/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
-	FILE	-edex -close
-	/awips2/data_store/grid/NamDNG/ngrid/NamDNG_2p5km_\1_\3_\4Z_\5_\6-(seq).grib2
+#NGRID	^[LM].I... KWBE ...... !grib2/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
+#	FILE	-edex -close
+#	/awips2/data_store/grid/NamDNG/ngrid/NamDNG_2p5km_\1_\3_\4Z_\5_\6-(seq).grib2
 #
 # NamDNG 2.5 km HDS (NamDNG)
 #HDS	^[LM].J.{1,3} KWB. .......*/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*)
@@ -1174,6 +1190,6 @@ HDS	^(ZEX.98) KWNH (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#218/([0-9]{8})(
 #
 # National Blend of Models
 #
-NGRID	^(Y.A...) (KWE[AB]) (......)
-	FILE	-edex -close
-	/awips2/data_store/grid/NationalBlend/NationalBlend_\1_\2_\3.grib2
+#NGRID	^(Y.A...) (KWE[AB]) (......)
+#	FILE	-edex -close
+#	/awips2/data_store/grid/NationalBlend/NationalBlend_\1_\2_\3.grib2