diff --git a/terraform/demo/main.tf b/terraform/demo/main.tf
index b22482809..b81c9a3ec 100644
--- a/terraform/demo/main.tf
+++ b/terraform/demo/main.tf
@@ -15,8 +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_space_name   = local.cf_space_name
+  cf_space_id     = local.cf_space_name
   name            = "${local.app_name}-redis-v70-${local.env}"
   redis_plan_name = "redis-dev"
   json_params = jsonencode(
diff --git a/terraform/production/main.tf b/terraform/production/main.tf
index e894ea751..515842187 100644
--- a/terraform/production/main.tf
+++ b/terraform/production/main.tf
@@ -15,8 +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_space_name   = local.cf_space_name
+  cf_space_id     = local.cf_space_name
   name            = "${local.app_name}-redis-v70-${local.env}"
   redis_plan_name = "redis-3node-large"
   json_params = jsonencode(
diff --git a/terraform/sandbox/main.tf b/terraform/sandbox/main.tf
index 6f830172c..2cd143d00 100644
--- a/terraform/sandbox/main.tf
+++ b/terraform/sandbox/main.tf
@@ -15,8 +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_space_name   = local.cf_space_name
+  cf_space_id     = local.cf_space_name
   name            = "${local.app_name}-redis-v70-${local.env}"
   redis_plan_name = "redis-dev"
   json_params = jsonencode(
diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf
index fc68d6871..0c5bc5371 100644
--- a/terraform/staging/main.tf
+++ b/terraform/staging/main.tf
@@ -15,8 +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_space_name   = local.cf_space_name
+  cf_space_id     = local.cf_space_name
   name            = "${local.app_name}-redis-v70-${local.env}"
   redis_plan_name = "redis-dev"
   json_params = jsonencode(