diff --git a/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/ingestion_manifest.py b/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/ingestion_manifest.py
index d0cd760273e6521cd0c03d9b60279aa2ca2afed6..4f29b790d892ae2ab801bc9305143c37a9ea1c88 100644
--- a/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/ingestion_manifest.py
+++ b/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/ingestion_manifest.py
@@ -105,12 +105,15 @@ class IngestionManifest(ManifestComponentIF):
     def get_ngas_flag(self) -> bool:
         """Determine and retrieve the correct ingestNGAS flag for this type of ingestion/curation"""
 
-        # default to true for all types
-        flag = True
-        # TODO: Add properties for other types
-        if self.sp_type == ScienceProductType.EXEC_BLOCK:
-            if self.telescope == Telescope.VLBA or self.telescope == Telescope.GMVA:
-                flag = CapoConfig().getboolean("archive-ingestion.ingestNGAS")
+        match self.sp_type:
+            case ScienceProductType.EXEC_BLOCK:
+                flag = CapoConfig().getboolean("archive-ingestion.ingestNGAS.observation")
+            case ScienceProductType.EVLA_CAL:
+                flag = CapoConfig().getboolean("archive-ingestion.ingestNGAS.calibration")
+            case ScienceProductType.IMAGE | ScienceProductType.VLASS_SECI:
+                flag = CapoConfig().getboolean("archive-ingestion.ingestNGAS.imaging")
+            case _:
+                flag = True
 
         return flag