diff --git a/packages/test-data/payloads/amsr2/discover.json b/packages/test-data/payloads/amsr2/discover.json
index 819aef8afc0b..ef74ae2e790f 100644
--- a/packages/test-data/payloads/amsr2/discover.json
+++ b/packages/test-data/payloads/amsr2/discover.json
@@ -46,7 +46,7 @@
     "id": "AMSR2",
     "meta": {
       "name": "AMSR2",
-      "version": "1",
+      "version": "1.0",
       "granuleId": "^GW1AM2_[\\d]{12}_[\\d]{3}B_L1S[N|G]RTBR_[\\d]{7}$",
       "sampleFileName": "GW1AM2_201708071110_057B_L1SNRTBR_2220220.h5.gz",
       "granuleIdExtraction": "^(GW1AM2_(.*))\\.h5\\.gz$",
diff --git a/tf-modules/opex-workflow/collections/CSLC_S1.json b/tf-modules/opex-workflow/collections/CSLC_S1.json
index c1a70b3ada56..e4bd9d1e5082 100644
--- a/tf-modules/opex-workflow/collections/CSLC_S1.json
+++ b/tf-modules/opex-workflow/collections/CSLC_S1.json
@@ -1,6 +1,6 @@
 {
     "name": "OPERA_L2_CSLC-S1_V1",
-    "version": "1",
+    "version": "1.0",
     "duplicateHandling": "replace",
     "process": "CSLC",
     "url_path": "OPERA_L2_CSLC-S1/{granule.granuleId}/",
diff --git a/tf-modules/opex-workflow/collections/DISP_S1.json b/tf-modules/opex-workflow/collections/DISP_S1.json
index eab181a2a049..f9bc413273f6 100644
--- a/tf-modules/opex-workflow/collections/DISP_S1.json
+++ b/tf-modules/opex-workflow/collections/DISP_S1.json
@@ -1,6 +1,6 @@
 {
     "name": "OPERA_L3_DISP-S1_V1",
-    "version": "1",
+    "version": "1.0",
     "duplicateHandling": "replace",
     "process": "DISP",
     "url_path": "OPERA_L3_DISP-S1_V1/{granule.granuleId}/",
diff --git a/tf-modules/opex-workflow/collections/DISP_S1_STACK.json b/tf-modules/opex-workflow/collections/DISP_S1_STACK.json
index dc814de9c836..941400eb6f82 100644
--- a/tf-modules/opex-workflow/collections/DISP_S1_STACK.json
+++ b/tf-modules/opex-workflow/collections/DISP_S1_STACK.json
@@ -1,6 +1,6 @@
 {
     "name": "OPERA_L3_DISP-S1_STACK_V1",
-    "version": "1",
+    "version": "1.0",
     "duplicateHandling": "replace",
     "process": "DISP-STACK",
     "url_path": "OPERA_L3_DISP-S1_STACK_V1/{granule.granuleId}/",
diff --git a/tf-modules/opex-workflow/collections/DISP_S1_STATIC.json b/tf-modules/opex-workflow/collections/DISP_S1_STATIC.json
index b29e23d3ee02..f8bff7924f7c 100644
--- a/tf-modules/opex-workflow/collections/DISP_S1_STATIC.json
+++ b/tf-modules/opex-workflow/collections/DISP_S1_STATIC.json
@@ -1,6 +1,6 @@
 {
     "name": "OPERA_L3_DISP-S1-STATIC_V1",
-    "version": "1",
+    "version": "1.0",
     "duplicateHandling": "replace",
     "process": "DISP-STATIC",
     "url_path": "OPERA_L3_DISP-S1-STATIC_V1/{granule.granuleId}/",
diff --git a/tf-modules/opex-workflow/collections/DIST_ALERT_S1.json b/tf-modules/opex-workflow/collections/DIST_ALERT_S1.json
index eca0ee6ed672..cc829384a7a5 100644
--- a/tf-modules/opex-workflow/collections/DIST_ALERT_S1.json
+++ b/tf-modules/opex-workflow/collections/DIST_ALERT_S1.json
@@ -1,6 +1,6 @@
 {
     "name": "OPERA_L3_DIST-ALERT-S1_V1",
-    "version": "1",
+    "version": "1.0",
     "duplicateHandling": "replace",
     "process": "DIST",
     "url_path": "OPERA_L3_DIST-ALERT-S1_V1/{granule.granuleId}/",
diff --git a/tf-modules/opex-workflow/collections/TROPO_ZENITH.json b/tf-modules/opex-workflow/collections/TROPO_ZENITH.json
index 11a3ffc4f25f..bac87106f5ec 100644
--- a/tf-modules/opex-workflow/collections/TROPO_ZENITH.json
+++ b/tf-modules/opex-workflow/collections/TROPO_ZENITH.json
@@ -1,6 +1,6 @@
 {
     "name": "OPERA_L4_TROPO-ZENITH_V1",
-    "version": "1",
+    "version": "1.0",
     "duplicateHandling": "replace",
     "process": "TROPO",
     "url_path": "OPERA_L4_TROPO-ZENITH_V1/{granule.granuleId}/",
diff --git a/tf-modules/opex-workflow/data.tf b/tf-modules/opex-workflow/data.tf
index 11a5266bc96f..06da3bd7d653 100644
--- a/tf-modules/opex-workflow/data.tf
+++ b/tf-modules/opex-workflow/data.tf
@@ -3,7 +3,7 @@ data "aws_region" "current" {}
 
 data "terraform_remote_state" "cumulus" {
   backend   = "s3"
-  workspace = var.PREFIX
+  workspace = "default"
   config    = local.cumulus_remote_state_config
 }
 
diff --git a/tf-modules/opex-workflow/local.tf b/tf-modules/opex-workflow/local.tf
index c8509a15bf92..02f6bbb0ed83 100644
--- a/tf-modules/opex-workflow/local.tf
+++ b/tf-modules/opex-workflow/local.tf
@@ -5,7 +5,7 @@ locals {
   account_id = data.aws_caller_identity.current.account_id
   region = data.aws_region.current.name
   module_prefix = "${var.PREFIX}-opera"
-  system_bucket = "${var.PREFIX}-internal"
+  system_bucket = "${var.BUCKET_PREFIX}-internal"
   default_tags = {
     Deployment = var.PREFIX
   }
@@ -15,8 +15,8 @@ locals {
   distribution_url = ""  # Do we need this
 
   cumulus_remote_state_config = {
-    bucket = "${var.PREFIX}-tf-state"  # Do I want to add the last 4 digits of the AWS Account?
-    key    = "cumulus/terraform.tfstate"
+    bucket = "cumulus-sit-tfstate"  # Do I want to add the last 4 digits of the AWS Account?
+    key    = "nsidc-cumulus-prod/cumulus/terraform.tfstate"
     region = data.aws_region.current.name
   }
 
@@ -73,10 +73,10 @@ locals {
   }
 
     # Bucket types. These lists should not overlap
-  standard_bucket_names  = toset([for n, cfg in local.bucket_config : "${var.PREFIX}-${n}" if cfg.type == "standard"])
-  protected_bucket_names = toset([for n, cfg in local.bucket_config : "${var.PREFIX}-${n}" if cfg.type == "protected"])
-  public_bucket_names    = toset([for n, cfg in local.bucket_config : "${var.PREFIX}-${n}" if cfg.type == "public"])
-  workflow_bucket_names  = toset([for n, cfg in local.bucket_config : "${var.PREFIX}-${n}" if cfg.type == "workflow"])
+  standard_bucket_names  = toset([for n, cfg in local.bucket_config : "${var.BUCKET_PREFIX}-${n}" if cfg.type == "standard"])
+  protected_bucket_names = toset([for n, cfg in local.bucket_config : "${var.BUCKET_PREFIX}-${n}" if cfg.type == "protected"])
+  public_bucket_names    = toset([for n, cfg in local.bucket_config : "${var.BUCKET_PREFIX}-${n}" if cfg.type == "public"])
+  workflow_bucket_names  = toset([for n, cfg in local.bucket_config : "${var.BUCKET_PREFIX}-${n}" if cfg.type == "workflow"])
 
       dar_yes_tags = {
     DAR = "YES"
@@ -87,13 +87,13 @@ locals {
 
     base_bucket_map = {
     for n, cfg in local.bucket_config : n => {
-      name = "${var.PREFIX}-${n}"
+      name = "${var.BUCKET_PREFIX}-${n}"
       type = cfg.type == "standard" ? n : cfg.type
     }
   }
   internal_bucket_map = {
     internal = {
-      name = "${var.PREFIX}-internal"
+      name = "${var.BUCKET_PREFIX}-internal"
       type = "internal"
     }
   }
diff --git a/tf-modules/opex-workflow/rules/CSLC_S1.json b/tf-modules/opex-workflow/rules/CSLC_S1.json
index d5937c58a193..c9de7c1d337a 100644
--- a/tf-modules/opex-workflow/rules/CSLC_S1.json
+++ b/tf-modules/opex-workflow/rules/CSLC_S1.json
@@ -6,7 +6,7 @@
         "name": "OPERA_L2_CSLC-S1_V1",
         "version": "1.0"
     },
-    "provider": "ASFDAAC",
+    "provider": "ASF-TESTCNM",
     "rule": {
         "type": "sqs",
         "value": "https://sqs.$AWS_REGION.amazonaws.com/$AWS_ACCOUNT_ID/$PREFIX-opera-workflow-queue"
diff --git a/tf-modules/opex-workflow/rules/CSLC_S1_CALVAL.json b/tf-modules/opex-workflow/rules/CSLC_S1_CALVAL.json
index a71dcd9a45ba..594a663496e3 100644
--- a/tf-modules/opex-workflow/rules/CSLC_S1_CALVAL.json
+++ b/tf-modules/opex-workflow/rules/CSLC_S1_CALVAL.json
@@ -6,7 +6,7 @@
         "name": "OPERA_L2_CSLC-S1_CALVAL_V1",
         "version": "1.0"
     },
-    "provider": "ASFDAAC",
+    "provider": "ASF-TESTCNM",
     "rule": {
         "type": "sqs",
         "value": "https://sqs.$AWS_REGION.amazonaws.com/$AWS_ACCOUNT_ID/$PREFIX-opera-workflow-queue"
diff --git a/tf-modules/opex-workflow/rules/CSLC_S1_STATIC.json b/tf-modules/opex-workflow/rules/CSLC_S1_STATIC.json
index 61c8448cd64d..089b490eee42 100644
--- a/tf-modules/opex-workflow/rules/CSLC_S1_STATIC.json
+++ b/tf-modules/opex-workflow/rules/CSLC_S1_STATIC.json
@@ -6,7 +6,7 @@
         "name": "OPERA_L2_CSLC-S1-STATIC_V1",
         "version": "1.0"
     },
-    "provider": "ASFDAAC",
+    "provider": "ASF-TESTCNM",
     "rule": {
         "type": "sqs",
         "value": "https://sqs.$AWS_REGION.amazonaws.com/$AWS_ACCOUNT_ID/$PREFIX-opera-workflow-queue"
diff --git a/tf-modules/opex-workflow/rules/CSLC_S1_STATIC_CALVAL.json b/tf-modules/opex-workflow/rules/CSLC_S1_STATIC_CALVAL.json
index 69b29e631350..5be6ef47f9da 100644
--- a/tf-modules/opex-workflow/rules/CSLC_S1_STATIC_CALVAL.json
+++ b/tf-modules/opex-workflow/rules/CSLC_S1_STATIC_CALVAL.json
@@ -6,7 +6,7 @@
         "name": "OPERA_L2_CSLC-S1-STATIC_CALVAL_V1",
         "version": "1.0"
     },
-    "provider": "ASFDAAC",
+    "provider": "ASF-TESTCNM",
     "rule": {
         "type": "sqs",
         "value": "https://sqs.$AWS_REGION.amazonaws.com/$AWS_ACCOUNT_ID/$PREFIX-opera-workflow-queue"
diff --git a/tf-modules/opex-workflow/rules/DISP_S1.json b/tf-modules/opex-workflow/rules/DISP_S1.json
index 22916a02e2e3..8473e2fe86ba 100644
--- a/tf-modules/opex-workflow/rules/DISP_S1.json
+++ b/tf-modules/opex-workflow/rules/DISP_S1.json
@@ -4,9 +4,9 @@
     "state": "ENABLED",
     "collection": {
         "name": "OPERA_L3_DISP-S1_V1",
-        "version": "1"
+        "version": "1.0"
     },
-    "provider": "ASFDAAC",
+    "provider": "ASF-TESTCNM",
     "rule": {
         "type": "sqs",
         "value": "https://sqs.$AWS_REGION.amazonaws.com/$AWS_ACCOUNT_ID/$PREFIX-opera-workflow-queue"
diff --git a/tf-modules/opex-workflow/rules/DISP_S1_PROV.json b/tf-modules/opex-workflow/rules/DISP_S1_PROV.json
index c381c8611e7e..cdb1df98e3fd 100644
--- a/tf-modules/opex-workflow/rules/DISP_S1_PROV.json
+++ b/tf-modules/opex-workflow/rules/DISP_S1_PROV.json
@@ -6,7 +6,7 @@
         "name": "OPERA_L3_DISP-S1_PROVISIONAL_V0",
         "version": "0"
     },
-    "provider": "ASFDAAC",
+    "provider": "ASF-TESTCNM",
     "rule": {
         "type": "sqs",
         "value": "https://sqs.$AWS_REGION.amazonaws.com/$AWS_ACCOUNT_ID/$PREFIX-opera-workflow-queue"
diff --git a/tf-modules/opex-workflow/rules/DISP_S1_STATIC.json b/tf-modules/opex-workflow/rules/DISP_S1_STATIC.json
index 87b4c44d31be..3bb99293eec2 100644
--- a/tf-modules/opex-workflow/rules/DISP_S1_STATIC.json
+++ b/tf-modules/opex-workflow/rules/DISP_S1_STATIC.json
@@ -4,9 +4,9 @@
     "state": "ENABLED",
     "collection": {
         "name": "OPERA_L3_DISP-S1-STATIC_V1",
-        "version": "1"
+        "version": "1.0"
     },
-    "provider": "ASFDAAC",
+    "provider": "ASF-TESTCNM",
     "rule": {
         "type": "sqs",
         "value": "https://sqs.$AWS_REGION.amazonaws.com/$AWS_ACCOUNT_ID/$PREFIX-opera-workflow-queue"
diff --git a/tf-modules/opex-workflow/rules/DISP_S1_STATIC_PROV.json b/tf-modules/opex-workflow/rules/DISP_S1_STATIC_PROV.json
index f32584c5d60b..a8604200f466 100644
--- a/tf-modules/opex-workflow/rules/DISP_S1_STATIC_PROV.json
+++ b/tf-modules/opex-workflow/rules/DISP_S1_STATIC_PROV.json
@@ -6,7 +6,7 @@
         "name": "OPERA_L3_DISP-S1-STATIC_PROVISIONAL_V0",
         "version": "0"
     },
-    "provider": "ASFDAAC",
+    "provider": "ASF-TESTCNM",
     "rule": {
         "type": "sqs",
         "value": "https://sqs.$AWS_REGION.amazonaws.com/$AWS_ACCOUNT_ID/$PREFIX-opera-workflow-queue"
diff --git a/tf-modules/opex-workflow/rules/DIST_ALERT_S1.json b/tf-modules/opex-workflow/rules/DIST_ALERT_S1.json
index 5484401fb49c..db3718cecfca 100644
--- a/tf-modules/opex-workflow/rules/DIST_ALERT_S1.json
+++ b/tf-modules/opex-workflow/rules/DIST_ALERT_S1.json
@@ -4,9 +4,9 @@
     "state": "ENABLED",
     "collection": {
         "name": "OPERA_L3_DIST-ALERT-S1_V1",
-        "version": "1"
+        "version": "1.0"
     },
-    "provider": "ASFDAAC",
+    "provider": "ASF-TESTCNM",
     "rule": {
         "type": "sqs",
         "value":  "https://sqs.$AWS_REGION.amazonaws.com/$AWS_ACCOUNT_ID/$PREFIX-opera-workflow-queue"
diff --git a/tf-modules/opex-workflow/rules/DIST_ALERT_S1_PROV.json b/tf-modules/opex-workflow/rules/DIST_ALERT_S1_PROV.json
index ae1c183671d3..d134cb795e3e 100644
--- a/tf-modules/opex-workflow/rules/DIST_ALERT_S1_PROV.json
+++ b/tf-modules/opex-workflow/rules/DIST_ALERT_S1_PROV.json
@@ -6,7 +6,7 @@
         "name": "OPERA_L3_DIST-ALERT-S1_PROVISIONAL_V0",
         "version": "0"
     },
-    "provider": "ASFDAAC",
+    "provider": "ASF-TESTCNM",
     "rule": {
         "type": "sqs",
         "value":  "https://sqs.$AWS_REGION.amazonaws.com/$AWS_ACCOUNT_ID/$PREFIX-opera-workflow-queue"
diff --git a/tf-modules/opex-workflow/rules/RTC_S1.json b/tf-modules/opex-workflow/rules/RTC_S1.json
index e14bfe1d0648..4db77c4e50e6 100644
--- a/tf-modules/opex-workflow/rules/RTC_S1.json
+++ b/tf-modules/opex-workflow/rules/RTC_S1.json
@@ -6,7 +6,7 @@
         "name": "OPERA_L2_RTC-S1_V1",
         "version": "1.0"
     },
-    "provider": "ASFDAAC",
+    "provider": "ASF-TESTCNM",
     "rule": {
         "type": "sqs",
         "value": "https://sqs.$AWS_REGION.amazonaws.com/$AWS_ACCOUNT_ID/$PREFIX-opera-workflow-queue"
diff --git a/tf-modules/opex-workflow/rules/RTC_S1_CALVAL.json b/tf-modules/opex-workflow/rules/RTC_S1_CALVAL.json
index c566c9890563..93923b1f9fb0 100644
--- a/tf-modules/opex-workflow/rules/RTC_S1_CALVAL.json
+++ b/tf-modules/opex-workflow/rules/RTC_S1_CALVAL.json
@@ -6,7 +6,7 @@
         "name": "OPERA_L2_RTC-S1_CALVAL_V1",
         "version": "1.0"
     },
-    "provider": "ASFDAAC",
+    "provider": "ASF-TESTCNM",
     "rule": {
         "type": "sqs",
         "value": "https://sqs.$AWS_REGION.amazonaws.com/$AWS_ACCOUNT_ID/$PREFIX-opera-workflow-queue"
diff --git a/tf-modules/opex-workflow/rules/RTC_S1_STATIC.json b/tf-modules/opex-workflow/rules/RTC_S1_STATIC.json
index 2be0a419715c..609f1e1fbfa8 100644
--- a/tf-modules/opex-workflow/rules/RTC_S1_STATIC.json
+++ b/tf-modules/opex-workflow/rules/RTC_S1_STATIC.json
@@ -6,7 +6,7 @@
         "name": "OPERA_L2_RTC-S1-STATIC_V1",
         "version": "1.0"
     },
-    "provider": "ASFDAAC",
+    "provider": "ASF-TESTCNM",
     "rule": {
         "type": "sqs",
         "value": "https://sqs.$AWS_REGION.amazonaws.com/$AWS_ACCOUNT_ID/$PREFIX-opera-workflow-queue"
diff --git a/tf-modules/opex-workflow/rules/RTC_S1_STATIC_CALVAL.json b/tf-modules/opex-workflow/rules/RTC_S1_STATIC_CALVAL.json
index 4c94bc683e2c..d6d6a473c92a 100644
--- a/tf-modules/opex-workflow/rules/RTC_S1_STATIC_CALVAL.json
+++ b/tf-modules/opex-workflow/rules/RTC_S1_STATIC_CALVAL.json
@@ -6,7 +6,7 @@
         "name": "OPERA_L2_RTC-S1-STATIC_CALVAL_V1",
         "version": "1.0"
     },
-    "provider": "ASFDAAC",
+    "provider": "ASF-TESTCNM",
     "rule": {
         "type": "sqs",
         "value": "https://sqs.$AWS_REGION.amazonaws.com/$AWS_ACCOUNT_ID/$PREFIX-opera-workflow-queue"
diff --git a/tf-modules/opex-workflow/rules/TROPO_ZENITH.json b/tf-modules/opex-workflow/rules/TROPO_ZENITH.json
index 553051242e04..118bc621c2d2 100644
--- a/tf-modules/opex-workflow/rules/TROPO_ZENITH.json
+++ b/tf-modules/opex-workflow/rules/TROPO_ZENITH.json
@@ -4,9 +4,9 @@
     "state": "ENABLED",
     "collection": {
         "name": "OPERA_L4_TROPO-ZENITH_V1",
-        "version": "1"
+        "version": "1.0"
     },
-    "provider": "ASFDAAC",
+    "provider": "ASF-TESTCNM",
     "rule": {
         "type": "sqs",
         "value": "https://sqs.$AWS_REGION.amazonaws.com/$AWS_ACCOUNT_ID/$PREFIX-opera-workflow-queue"
diff --git a/tf-modules/opex-workflow/rules/TROPO_ZENITH_PROV.json b/tf-modules/opex-workflow/rules/TROPO_ZENITH_PROV.json
index 96c8b566d1ff..70c30fb20660 100644
--- a/tf-modules/opex-workflow/rules/TROPO_ZENITH_PROV.json
+++ b/tf-modules/opex-workflow/rules/TROPO_ZENITH_PROV.json
@@ -6,7 +6,7 @@
         "name": "OPERA_L4_TROPO-ZENITH_PROVISIONAL_V0",
         "version": "0"
     },
-    "provider": "ASFDAAC",
+    "provider": "ASF-TESTCNM",
     "rule": {
         "type": "sqs",
         "value": "https://sqs.$AWS_REGION.amazonaws.com/$AWS_ACCOUNT_ID/$PREFIX-opera-workflow-queue"
diff --git a/tf-modules/opex-workflow/testcnm.cfg b/tf-modules/opex-workflow/testcnm.cfg
index 09f2c4000fb7..c30abef24357 100644
--- a/tf-modules/opex-workflow/testcnm.cfg
+++ b/tf-modules/opex-workflow/testcnm.cfg
@@ -1,7 +1,8 @@
 [default]
 test_bucket        = opex-e2e-test-bucket
-stack_name         = dms-opex-sbx
+profile            = opex-sit
+stack_name         = nsidc-cumulus-prod
 cnm_ingest_queue   = opera-workflow-queue
 cnm_response_queue = opera-mock-response-queue
-provider           = JPL-OPERA
+provider           = ASF-TESTCNM
 trace              = TEST
diff --git a/tf-modules/opex-workflow/variables.tf b/tf-modules/opex-workflow/variables.tf
index f16bf811db85..8373d4187389 100644
--- a/tf-modules/opex-workflow/variables.tf
+++ b/tf-modules/opex-workflow/variables.tf
@@ -1,6 +1,11 @@
 variable "PREFIX" {
   type    = string
-  default = "dms-opex-sbx"  # TODO: Update
+  default = "nsidc-cumulus-prod"
+}
+
+variable "BUCKET_PREFIX" {
+  type    = string
+  default = "opex-nsidc-cumulus"
 }
 
 variable "DIST_DIR" {
diff --git a/tf-modules/opex-workflow/workflow.tf b/tf-modules/opex-workflow/workflow.tf
index a1ccdf728b69..4c3f396314b5 100644
--- a/tf-modules/opex-workflow/workflow.tf
+++ b/tf-modules/opex-workflow/workflow.tf
@@ -1,5 +1,5 @@
 module "example_workflow" {
-  source = "https://github.com/nasa/cumulus/releases/download/v21.0.1/terraform-aws-cumulus-workflow.zip" # Confirm which version We are on
+  source = "../../tf-modules/opex-workflow"
 
   prefix          = var.PREFIX
   name            = "OPERAWorkflow"