diff --git a/terraform/demo/main.tf b/terraform/demo/main.tf
index ddfc6b9be..b22482809 100644
--- a/terraform/demo/main.tf
+++ b/terraform/demo/main.tf
@@ -29,9 +29,8 @@ module "redis-v70" {
 module "logo_upload_bucket" {
   source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0"
 
-  cf_org_name   = local.cf_org_name
-  cf_space_name = local.cf_space_name
-  name          = "${local.app_name}-logo-upload-bucket-${local.env}"
+  cf_space_id = local.cf_space_name
+  name        = "${local.app_name}-logo-upload-bucket-${local.env}"
 }
 
 module "api_network_route" {
diff --git a/terraform/development/main.tf b/terraform/development/main.tf
index e5fe1c743..e9995bd58 100644
--- a/terraform/development/main.tf
+++ b/terraform/development/main.tf
@@ -12,9 +12,8 @@ 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_space_name = local.cf_space_name
-  name          = "${var.username}-logo-upload-bucket"
+  cf_space_id = local.cf_space_name
+  name        = "${var.username}-logo-upload-bucket"
 }
 resource "cloudfoundry_service_key" "logo_key" {
   name             = local.key_name
diff --git a/terraform/production/main.tf b/terraform/production/main.tf
index 3fd38c323..e894ea751 100644
--- a/terraform/production/main.tf
+++ b/terraform/production/main.tf
@@ -29,9 +29,8 @@ module "redis-v70" {
 module "logo_upload_bucket" {
   source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0"
 
-  cf_org_name   = local.cf_org_name
-  cf_space_name = local.cf_space_name
-  name          = "${local.app_name}-logo-upload-bucket-${local.env}"
+  cf_space_id = local.cf_space_name
+  name        = "${local.app_name}-logo-upload-bucket-${local.env}"
 }
 
 module "api_network_route" {
diff --git a/terraform/sandbox/main.tf b/terraform/sandbox/main.tf
index 2ba534a51..6f830172c 100644
--- a/terraform/sandbox/main.tf
+++ b/terraform/sandbox/main.tf
@@ -29,9 +29,8 @@ module "redis-v70" {
 module "logo_upload_bucket" {
   source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0"
 
-  cf_org_name   = local.cf_org_name
-  cf_space_name = local.cf_space_name
-  name          = "${local.app_name}-logo-upload-bucket-${local.env}"
+  cf_space_id = local.cf_space_name
+  name        = "${local.app_name}-logo-upload-bucket-${local.env}"
 }
 
 module "api_network_route" { # API and Admin apps must both exist in Cloud
diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf
index 70f07c690..fc68d6871 100644
--- a/terraform/staging/main.tf
+++ b/terraform/staging/main.tf
@@ -29,9 +29,8 @@ module "redis-v70" {
 module "logo_upload_bucket" {
   source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0"
 
-  cf_org_name   = local.cf_org_name
-  cf_space_name = local.cf_space_name
-  name          = "${local.app_name}-logo-upload-bucket-${local.env}"
+  cf_space_id = local.cf_space_name
+  name        = "${local.app_name}-logo-upload-bucket-${local.env}"
 }
 
 module "api_network_route" {