diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf
index a2a108871..87c1e64dd 100644
--- a/terraform/staging/main.tf
+++ b/terraform/staging/main.tf
@@ -14,9 +14,7 @@ resource "null_resource" "prevent_destroy" {
 
 module "redis-v70" {
   source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v1.0.0"
-  providers = {
-    cloudfoundry = cloudfoundry
-  }
+
   cf_org_name     = local.cf_org_name
   cf_space_name   = local.cf_space_name
   name            = "${local.app_name}-redis-v70-${local.env}"
@@ -30,10 +28,7 @@ module "redis-v70" {
 
 module "logo_upload_bucket" {
   source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v1.0.0"
-  providers = {
 
-    cloudfoundry = cloudfoundry
-  }
   cf_org_name   = local.cf_org_name
   cf_space_name = local.cf_space_name
   name          = "${local.app_name}-logo-upload-bucket-${local.env}"
@@ -41,10 +36,7 @@ module "logo_upload_bucket" {
 
 module "api_network_route" {
   source = "../shared/container_networking"
-  providers = {
 
-    cloudfoundry = cloudfoundry
-  }
   cf_org_name          = local.cf_org_name
   cf_space_name        = local.cf_space_name
   source_app_name      = "${local.app_name}-${local.env}"
diff --git a/terraform/staging/providers.tf b/terraform/staging/providers.tf
index 955db4bd5..e14251fdf 100644
--- a/terraform/staging/providers.tf
+++ b/terraform/staging/providers.tf
@@ -20,16 +20,16 @@ terraform {
   }
 }
 
-# Official provider (default)
+# 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 (aliased)
+# Community provider (should be aliased but default for now)
 provider "cfcommunity" {
-  alias        = "community"
   api_url      = "https://api.fr.cloud.gov"
   user         = var.cf_user
   password     = var.cf_password