diff --git a/terraform/demo/providers.tf b/terraform/demo/providers.tf
index 3dc320063..6b7022538 100644
--- a/terraform/demo/providers.tf
+++ b/terraform/demo/providers.tf
@@ -5,6 +5,10 @@ terraform {
       source  = "cloudfoundry-community/cloudfoundry"
       version = "0.53.1"
     }
+    cfcommunity = {
+      source  = "cloudfoundry-community/cloudfoundry"
+      version = "0.53.1"
+    }
   }
 
   backend "s3" {
@@ -16,7 +20,16 @@ terraform {
   }
 }
 
+# Official provider (should be default but aliased for now)
 provider "cloudfoundry" {
+  alias    = "official"
+  api_url  = "https://api.fr.cloud.gov"
+  user     = var.cf_user
+  password = var.cf_password
+}
+
+# Community provider (should be aliased but default for now)
+provider "cfcommunity" {
   api_url      = "https://api.fr.cloud.gov"
   user         = var.cf_user
   password     = var.cf_password
diff --git a/terraform/production/providers.tf b/terraform/production/providers.tf
index 84ad4aac4..3ad4124f7 100644
--- a/terraform/production/providers.tf
+++ b/terraform/production/providers.tf
@@ -5,6 +5,10 @@ terraform {
       source  = "cloudfoundry-community/cloudfoundry"
       version = "0.53.1"
     }
+    cfcommunity = {
+      source  = "cloudfoundry-community/cloudfoundry"
+      version = "0.53.1"
+    }
   }
 
   backend "s3" {
@@ -16,7 +20,16 @@ terraform {
   }
 }
 
+# Official provider (should be default but aliased for now)
 provider "cloudfoundry" {
+  alias    = "official"
+  api_url  = "https://api.fr.cloud.gov"
+  user     = var.cf_user
+  password = var.cf_password
+}
+
+# Community provider (should be aliased but default for now)
+provider "cfcommunity" {
   api_url      = "https://api.fr.cloud.gov"
   user         = var.cf_user
   password     = var.cf_password