diff --git a/terraform/demo/main.tf b/terraform/demo/main.tf
index 8c8e9db07..0df9d32b6 100644
--- a/terraform/demo/main.tf
+++ b/terraform/demo/main.tf
@@ -15,7 +15,7 @@ resource "null_resource" "prevent_destroy" {
 module "redis-v70" {
   source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.4.0"
 
-  cf_org_name     = local.cf_org_name
+  # cf_org_name     = local.cf_org_name
   cf_space_id     = local.cf_space_id
   name            = "${local.app_name}-redis-v70-${local.env}"
   redis_plan_name = "redis-dev"
diff --git a/terraform/development/main.tf b/terraform/development/main.tf
index 5756d398c..91b3741c5 100644
--- a/terraform/development/main.tf
+++ b/terraform/development/main.tf
@@ -12,7 +12,7 @@ data "cloudfoundry_space" "dev" {
 module "logo_upload_bucket" {
   source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0"
 
-  cf_org_name = local.cf_org_name
+  # cf_org_name = local.cf_org_name
   cf_space_id = local.cf_space_id
   name        = "${var.username}-logo-upload-bucket"
 }
diff --git a/terraform/production/main.tf b/terraform/production/main.tf
index 7d88fae69..1e86a50c4 100644
--- a/terraform/production/main.tf
+++ b/terraform/production/main.tf
@@ -15,7 +15,7 @@ resource "null_resource" "prevent_destroy" {
 module "redis-v70" {
   source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.4.0"
 
-  cf_org_name     = local.cf_org_name
+  # cf_org_name     = local.cf_org_name
   cf_space_id     = local.cf_space_id
   name            = "${local.app_name}-redis-v70-${local.env}"
   redis_plan_name = "redis-3node-large"
diff --git a/terraform/sandbox/main.tf b/terraform/sandbox/main.tf
index 2d745d00e..07f8abf1d 100644
--- a/terraform/sandbox/main.tf
+++ b/terraform/sandbox/main.tf
@@ -15,7 +15,7 @@ resource "null_resource" "prevent_destroy" {
 module "redis-v70" {
   source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.4.0"
 
-  cf_org_name     = local.cf_org_name
+  # cf_org_name     = local.cf_org_name
   cf_space_id     = local.cf_space_id
   name            = "${local.app_name}-redis-v70-${local.env}"
   redis_plan_name = "redis-dev"
diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf
index d8396c5dc..f48971ad9 100644
--- a/terraform/staging/main.tf
+++ b/terraform/staging/main.tf
@@ -15,7 +15,7 @@ resource "null_resource" "prevent_destroy" {
 module "redis-v70" {
   source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.4.0"
 
-  cf_org_name     = local.cf_org_name
+  # cf_org_name     = local.cf_org_name
   cf_space_id     = local.cf_space_id
   name            = "${local.app_name}-redis-v70-${local.env}"
   redis_plan_name = "redis-dev"