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 129da2ad493859804088c0b1789acab526788e05..770f21726388d2776553ccc826e9bdc76d324f7a 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
@@ -455,10 +455,10 @@ class IngestionManifestBuilder:
         :return:
         """
         return ReingestGroup(
-            locator=self.locator if self.product_group is None else None,
+            locator=self.product_group if self.product_group else self.locator,
             product_type=self.sp_type,
             targets=self.target_list,
-            product_group=self.product_group,
+            # product_group=self.product_group,
         )
 
     def _build_input_group(self) -> InputGroup:
diff --git a/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/launchers.py b/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/launchers.py
index a1aa864986a32cb2a098bd74404ea9b6eb9bc02a..973c6a7b9381fc65785fd2d45197a65460087840 100644
--- a/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/launchers.py
+++ b/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/launchers.py
@@ -334,7 +334,7 @@ class CuratorLauncher(LauncherIF):
         curation_source = self.parameters["curation_source"]
         target_list = self.parameters["target_list"]
         file_list = self.parameters["file_list"]
-        product_group = self.parameters["product_group"]
+        product_group = self.parameters["product_group_id"]
         input_group_locator = self.parameters["input_group_locator"]
 
         IngestionManifestBuilder(
diff --git a/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/solicitor.py b/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/solicitor.py
index d89ec0afcd18e17f2b800c24446afa7b99217672..7925088ad634fb239e6a1f716a8a4d7313460b30 100644
--- a/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/solicitor.py
+++ b/apps/cli/executables/pexable/ingest_envoy/ingest_envoy/solicitor.py
@@ -241,7 +241,7 @@ class Solicitor:
             "product_type": self.metadata["product_type"],
             "curation_source": self.metadata.get("data_location"),  # not required for curation
             "file_list": list(filter(None, self.metadata.get("file_list").split(","))),
-            "product_group": self.metadata.get("product_group"),
+            "product_group_id": self.metadata.get("product_group_id"),
             "target_list": targets,
         }
         return params
diff --git a/apps/cli/executables/pexable/ingest_envoy/test/examples/full_curation_evla_eb_manifest.json b/apps/cli/executables/pexable/ingest_envoy/test/examples/full_curation_evla_eb_manifest.json
index d3227d1bfe4dc37885a5275e93a64bb71668dce6..e642dae699a88ba45f9a54bad0bf403a3e1aa0cb 100644
--- a/apps/cli/executables/pexable/ingest_envoy/test/examples/full_curation_evla_eb_manifest.json
+++ b/apps/cli/executables/pexable/ingest_envoy/test/examples/full_curation_evla_eb_manifest.json
@@ -6,7 +6,7 @@
   },
   "reingest": {
     "type": "execution_block",
-    "product_group": 2
+    "locator": 2
   },
   "output_group": {
     "science_products": [
diff --git a/apps/cli/executables/pexable/ingest_envoy/test/examples/full_curation_evla_image_manifest.json b/apps/cli/executables/pexable/ingest_envoy/test/examples/full_curation_evla_image_manifest.json
index 22a70108a0758e64f1d588fef2cd59c8cc0b4a00..8e7000dbb61baa46ed99def2a47348dbc3304965 100644
--- a/apps/cli/executables/pexable/ingest_envoy/test/examples/full_curation_evla_image_manifest.json
+++ b/apps/cli/executables/pexable/ingest_envoy/test/examples/full_curation_evla_image_manifest.json
@@ -7,7 +7,7 @@
   },
   "reingest": {
     "type": "fits_image",
-    "product_group": 1
+    "locator": 1
   },
   "input_group": {
     "science_products": [
diff --git a/apps/cli/executables/pexable/ingest_envoy/test/examples/full_curation_evla_image_manifest2.json b/apps/cli/executables/pexable/ingest_envoy/test/examples/full_curation_evla_image_manifest2.json
index ff8c2cb87bb9759535f0a1b2a2caf43a654a3a72..c1aa70d3c487e3bee11ba044ae1f48514419ea43 100644
--- a/apps/cli/executables/pexable/ingest_envoy/test/examples/full_curation_evla_image_manifest2.json
+++ b/apps/cli/executables/pexable/ingest_envoy/test/examples/full_curation_evla_image_manifest2.json
@@ -5,7 +5,7 @@
     },
     "reingest": {
         "type": "image",
-        "product_group": 328918
+        "locator": 328918
     },
     "output_group": {
         "science_products": [
diff --git a/apps/cli/executables/pexable/ingest_envoy/test/input_files/test-full-curation-image-evla-metadata.json b/apps/cli/executables/pexable/ingest_envoy/test/input_files/test-full-curation-image-evla-metadata.json
index bc0c024391450f6745afc8ac6ac5858fb7248823..3fa470816f8c2634f6515bc875ef590cbd207433 100644
--- a/apps/cli/executables/pexable/ingest_envoy/test/input_files/test-full-curation-image-evla-metadata.json
+++ b/apps/cli/executables/pexable/ingest_envoy/test/input_files/test-full-curation-image-evla-metadata.json
@@ -4,7 +4,7 @@
     "telescope": "EVLA",
     "projectCode": "20B-377"
   },
-  "product_group": 328918,
+  "product_group_id": 328918,
   "file_list": "20B-377.MJD59909.70629903935.AT2019teq_sci.X_band.cont.I.mask.fits,20B-377.MJD59909.70629903935.AT2019teq_sci.X_band.cont.I.tt1.fits,20B-377.MJD59909.70629903935.AT2019teq_sci.X_band.cont.I.pbcor.tt0.fits,20B-377.MJD59909.70629903935.AT2019teq_sci.X_band.cont.I.pb.tt0.fits,20B-377.MJD59909.70629903935.AT2019teq_sci.X_band.cont.I.alpha.error.fits,20B-377.MJD59909.70629903935.AT2019teq_sci.X_band.cont.I.alpha.fits,20B-377.MJD59909.70629903935.AT2019teq_sci.X_band.cont.I.tt0.fits,20B-377.MJD59909.70629903935.AT2019teq_sci.C_band.cont.I.pb.tt0.fits,20B-377.MJD59909.70629903935.AT2019teq_sci.C_band.cont.I.alpha.error.fits,20B-377.MJD59909.70629903935.AT2019teq_sci.C_band.cont.I.pbcor.tt0.fits,20B-377.MJD59909.70629903935.AT2019teq_sci.C_band.cont.I.tt0.fits,20B-377.MJD59909.70629903935.AT2019teq_sci.C_band.cont.I.alpha.fits,20B-377.MJD59909.70629903935.AT2019teq_sci.C_band.cont.I.tt1.fits,20B-377.MJD59909.70629903935.AT2019teq_sci.C_band.cont.I.mask.fits,ingestion_artifacts_2022_12_14T06_22_03.874.tar,weblog.tgz,pipeline_artifacts_2022_12_09T19_08_32.tar,",
   "input_group_locator": "uid://evla/calibration/620195ad-1d11-49f4-be1f-3532092565c1"
 }
diff --git a/apps/cli/executables/pexable/ingest_envoy/test/test_curator_manifest.py b/apps/cli/executables/pexable/ingest_envoy/test/test_curator_manifest.py
index c4a46e3daebc991e66f4a1eff1d2410e6e35092b..fa1c7ff71058ff404b93ca1d97836b6cb0f703f9 100644
--- a/apps/cli/executables/pexable/ingest_envoy/test/test_curator_manifest.py
+++ b/apps/cli/executables/pexable/ingest_envoy/test/test_curator_manifest.py
@@ -107,8 +107,7 @@ def test_manifest_full_curation_eb_manifest(
     reingest = actual_manifest.reingest
     assert reingest
     assert reingest.targets == None
-    assert reingest.locator == None
-    assert reingest.product_group == EVLA_EB_PRODUCT_GROUP
+    assert reingest.locator == EVLA_EB_PRODUCT_GROUP
     assert reingest.product_type == ScienceProductType.EXEC_BLOCK
 
     # Check actual file
@@ -252,12 +251,12 @@ def test_manifest_full_curation_image(use_file_list: bool, ingest_path: Path, al
     actual_manifest, actual_manifest_file = IngestionManifestBuilder(
         file_list=file_list,
         manifest_destination_dir=manifest_destination_dir,
-        product_group=IMAGE_PRODUCT_GROUP,
+        # product_group=IMAGE_PRODUCT_GROUP,
         input_group_locator=IMAGE_LOCATOR,
         manifest_source_dir=curation_source,
         telescope=Telescope.EVLA.value,
         sp_type=ScienceProductType.IMAGE.value,
-        locator=IMAGE_LOCATOR,
+        locator=IMAGE_PRODUCT_GROUP,
         curate=(CuratorType.FULL, None),
     ).build()
     assert actual_manifest_file.name == CURATOR_MANIFEST_FILENAME
@@ -278,8 +277,8 @@ def test_manifest_full_curation_image(use_file_list: bool, ingest_path: Path, al
     reingest = actual_manifest.reingest
     assert reingest
     assert reingest.targets == None
-    assert reingest.locator == None
-    assert reingest.product_group == IMAGE_PRODUCT_GROUP
+    assert reingest.locator == IMAGE_PRODUCT_GROUP
+    # assert reingest.product_group == IMAGE_PRODUCT_GROUP
     assert reingest.product_type == ScienceProductType.IMAGE
     assert actual_manifest.input_group
     assert len(actual_manifest.input_group.science_products) == 1
diff --git a/apps/cli/executables/pexable/ingest_envoy/test/test_solicitor.py b/apps/cli/executables/pexable/ingest_envoy/test/test_solicitor.py
index b09d36cdaee989ea2b86b4d49efdae5b8cc3a6dc..9cd8e1e718d432b69412e320e4b2cb84e020e77d 100644
--- a/apps/cli/executables/pexable/ingest_envoy/test/test_solicitor.py
+++ b/apps/cli/executables/pexable/ingest_envoy/test/test_solicitor.py
@@ -117,7 +117,7 @@ class TestSolicitor:
         expected_parameters = {
             "telescope": "EVLA",
             "project": "20B-377",
-            "product_group": 328918,
+            "product_group_id": 328918,
             "product_type": "image",
             "curation_source": None,
             "target_list": None,