diff --git a/terraform/shared/ses/main.tf b/terraform/shared/ses/main.tf
index 1bee9a74a..174704d01 100644
--- a/terraform/shared/ses/main.tf
+++ b/terraform/shared/ses/main.tf
@@ -2,9 +2,8 @@
 # Target space/org
 ###
 
-data "cloudfoundry_space" "space" {
-  org_name = var.cf_org_name
-  name     = var.cf_space_name
+data "cloudfoundry_org" "org" {
+  name = var.cf_org_name
 }
 
 ###
diff --git a/terraform/shared/sns/main.tf b/terraform/shared/sns/main.tf
index 2df89907d..57d85e562 100644
--- a/terraform/shared/sns/main.tf
+++ b/terraform/shared/sns/main.tf
@@ -2,9 +2,8 @@
 # Target space/org
 ###
 
-data "cloudfoundry_space" "space" {
-  org_name = var.cf_org_name
-  name     = var.cf_space_name
+data "cloudfoundry_org" "org" {
+  name = var.cf_org_name
 }
 
 ###