diff --git a/terraform/bootstrap/main.tf b/terraform/bootstrap/main.tf
index 22ca38212..04edd8513 100644
--- a/terraform/bootstrap/main.tf
+++ b/terraform/bootstrap/main.tf
@@ -5,9 +5,9 @@ locals {
 module "s3" {
   source = "github.com/GSA-TTS/terraform-cloudgov//s3?ref=v2.4.0"
 
-  cf_org_name   = "gsa-tts-benefits-studio"
+  cf_org_name = "gsa-tts-benefits-studio"
   cf_space_id = "notify-management"
-  name          = local.s3_service_name
+  name        = local.s3_service_name
 }
 
 resource "cloudfoundry_service_key" "bucket_creds" {
diff --git a/terraform/demo/main.tf b/terraform/demo/main.tf
index 5279d3aa0..28fd9b334 100644
--- a/terraform/demo/main.tf
+++ b/terraform/demo/main.tf
@@ -1,8 +1,8 @@
 locals {
-  cf_org_name   = "gsa-tts-benefits-studio"
+  cf_org_name = "gsa-tts-benefits-studio"
   cf_space_id = "notify-demo"
-  env           = "demo"
-  app_name      = "notify-admin"
+  env         = "demo"
+  app_name    = "notify-admin"
 }
 
 resource "null_resource" "prevent_destroy" {
@@ -16,7 +16,7 @@ module "redis-v70" {
   source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.4.0"
 
   cf_org_name     = local.cf_org_name
-  cf_space_id   = local.cf_space_id
+  cf_space_id     = local.cf_space_id
   name            = "${local.app_name}-redis-v70-${local.env}"
   redis_plan_name = "redis-dev"
   json_params = jsonencode(
@@ -29,16 +29,16 @@ 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_org_name = local.cf_org_name
   cf_space_id = local.cf_space_id
-  name          = "${local.app_name}-logo-upload-bucket-${local.env}"
+  name        = "${local.app_name}-logo-upload-bucket-${local.env}"
 }
 
 module "api_network_route" {
   source = "../shared/container_networking"
 
   cf_org_name          = local.cf_org_name
-  cf_space_id        = local.cf_space_id
+  cf_space_id          = local.cf_space_id
   source_app_name      = "${local.app_name}-${local.env}"
   destination_app_name = "notify-api-${local.env}"
 }
diff --git a/terraform/development/main.tf b/terraform/development/main.tf
index 9fc4c27f7..5756d398c 100644
--- a/terraform/development/main.tf
+++ b/terraform/development/main.tf
@@ -1,7 +1,7 @@
 locals {
-  cf_org_name   = "gsa-tts-benefits-studio"
+  cf_org_name = "gsa-tts-benefits-studio"
   cf_space_id = "notify-local-dev"
-  key_name      = "${var.username}-admin-dev-key"
+  key_name    = "${var.username}-admin-dev-key"
 }
 
 data "cloudfoundry_space" "dev" {
@@ -12,9 +12,9 @@ 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_org_name = local.cf_org_name
   cf_space_id = local.cf_space_id
-  name          = "${var.username}-logo-upload-bucket"
+  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 1023cc2cd..27fbe8a41 100644
--- a/terraform/production/main.tf
+++ b/terraform/production/main.tf
@@ -1,8 +1,8 @@
 locals {
-  cf_org_name   = "gsa-tts-benefits-studio"
+  cf_org_name = "gsa-tts-benefits-studio"
   cf_space_id = "notify-production"
-  env           = "production"
-  app_name      = "notify-admin"
+  env         = "production"
+  app_name    = "notify-admin"
 }
 
 resource "null_resource" "prevent_destroy" {
@@ -16,7 +16,7 @@ module "redis-v70" {
   source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.4.0"
 
   cf_org_name     = local.cf_org_name
-  cf_space_id   = local.cf_space_id
+  cf_space_id     = local.cf_space_id
   name            = "${local.app_name}-redis-v70-${local.env}"
   redis_plan_name = "redis-3node-large"
   json_params = jsonencode(
@@ -29,16 +29,16 @@ 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_org_name = local.cf_org_name
   cf_space_id = local.cf_space_id
-  name          = "${local.app_name}-logo-upload-bucket-${local.env}"
+  name        = "${local.app_name}-logo-upload-bucket-${local.env}"
 }
 
 module "api_network_route" {
   source = "../shared/container_networking"
 
   cf_org_name          = local.cf_org_name
-  cf_space_id        = local.cf_space_id
+  cf_space_id          = local.cf_space_id
   source_app_name      = "${local.app_name}-${local.env}"
   destination_app_name = "notify-api-${local.env}"
 }
@@ -60,7 +60,7 @@ module "domain" {
   source = "github.com/GSA-TTS/terraform-cloudgov//domain?ref=v2.4.0"
 
   cf_org_name    = local.cf_org_name
-  cf_space_id  = local.cf_space_id
+  cf_space_id    = local.cf_space_id
   app_name_or_id = "${local.app_name}-${local.env}"
   name           = "${local.app_name}-domain-${local.env}"
   cdn_plan_name  = "domain"
diff --git a/terraform/sandbox/main.tf b/terraform/sandbox/main.tf
index 4e0149134..4bc14cf37 100644
--- a/terraform/sandbox/main.tf
+++ b/terraform/sandbox/main.tf
@@ -1,8 +1,8 @@
 locals {
-  cf_org_name   = "gsa-tts-benefits-studio"
+  cf_org_name = "gsa-tts-benefits-studio"
   cf_space_id = "notify-sandbox"
-  env           = "sandbox"
-  app_name      = "notify-admin"
+  env         = "sandbox"
+  app_name    = "notify-admin"
 }
 
 resource "null_resource" "prevent_destroy" {
@@ -16,7 +16,7 @@ module "redis-v70" {
   source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.4.0"
 
   cf_org_name     = local.cf_org_name
-  cf_space_id   = local.cf_space_id
+  cf_space_id     = local.cf_space_id
   name            = "${local.app_name}-redis-v70-${local.env}"
   redis_plan_name = "redis-dev"
   json_params = jsonencode(
@@ -29,16 +29,16 @@ 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_org_name = local.cf_org_name
   cf_space_id = local.cf_space_id
-  name          = "${local.app_name}-logo-upload-bucket-${local.env}"
+  name        = "${local.app_name}-logo-upload-bucket-${local.env}"
 }
 
 module "api_network_route" { # API and Admin apps must both exist in Cloud
   source = "../shared/container_networking"
 
   cf_org_name          = local.cf_org_name
-  cf_space_id        = local.cf_space_id
+  cf_space_id          = local.cf_space_id
   source_app_name      = "${local.app_name}-${local.env}"
   destination_app_name = "notify-api-${local.env}"
 }
diff --git a/terraform/staging/main.tf b/terraform/staging/main.tf
index 3050bde6e..79dac3015 100644
--- a/terraform/staging/main.tf
+++ b/terraform/staging/main.tf
@@ -1,8 +1,8 @@
 locals {
-  cf_org_name   = "gsa-tts-benefits-studio"
+  cf_org_name = "gsa-tts-benefits-studio"
   cf_space_id = "notify-staging"
-  env           = "staging"
-  app_name      = "notify-admin"
+  env         = "staging"
+  app_name    = "notify-admin"
 }
 
 resource "null_resource" "prevent_destroy" {
@@ -16,7 +16,7 @@ module "redis-v70" {
   source = "github.com/GSA-TTS/terraform-cloudgov//redis?ref=v2.4.0"
 
   cf_org_name     = local.cf_org_name
-  cf_space_id   = local.cf_space_id
+  cf_space_id     = local.cf_space_id
   name            = "${local.app_name}-redis-v70-${local.env}"
   redis_plan_name = "redis-dev"
   json_params = jsonencode(
@@ -29,16 +29,16 @@ 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_org_name = local.cf_org_name
   cf_space_id = local.cf_space_id
-  name          = "${local.app_name}-logo-upload-bucket-${local.env}"
+  name        = "${local.app_name}-logo-upload-bucket-${local.env}"
 }
 
 module "api_network_route" {
   source = "../shared/container_networking"
 
   cf_org_name          = local.cf_org_name
-  cf_space_id        = local.cf_space_id
+  cf_space_id          = local.cf_space_id
   source_app_name      = "${local.app_name}-${local.env}"
   destination_app_name = "notify-api-${local.env}"
 }