diff --git a/terraform/demo/main.tf b/terraform/demo/main.tf
index 0ac491fc5..e594264c2 100644
--- a/terraform/demo/main.tf
+++ b/terraform/demo/main.tf
@@ -6,9 +6,8 @@ locals {
   delete_recursive_allowed = false
 }
 
-data "cloudfoundry_space" "demo" {
-  org_name = local.cf_org_name
-  name     = local.cf_space_name
+data "cloudfoundry_org" "org" {
+  name = local.cf_org_name
 }
 
 resource "cloudfoundry_space" "notify-demo" {
diff --git a/terraform/production/main.tf b/terraform/production/main.tf
index f7fc93d68..ff1daad88 100644
--- a/terraform/production/main.tf
+++ b/terraform/production/main.tf
@@ -7,9 +7,8 @@ locals {
   allow_ssh                = false
 }
 
-data "cloudfoundry_space" "production" {
-  org_name = local.cf_org_name
-  name     = local.cf_space_name
+data "cloudfoundry_org" "org" {
+  name = local.cf_org_name
 }
 
 resource "cloudfoundry_space" "notify-production" {