diff --git a/infra/analytics/app-config/main.tf b/infra/analytics/app-config/main.tf
index 596d64c8c..fcc522320 100644
--- a/infra/analytics/app-config/main.tf
+++ b/infra/analytics/app-config/main.tf
@@ -21,8 +21,6 @@ locals {
 
   has_incident_management_service = false
 
-  feature_flags = ["foo", "bar"]
-
   environment_configs = {
     dev     = module.dev_config
     staging = module.staging_config
diff --git a/infra/analytics/app-config/outputs.tf b/infra/analytics/app-config/outputs.tf
index d06715d07..d4b3a4528 100644
--- a/infra/analytics/app-config/outputs.tf
+++ b/infra/analytics/app-config/outputs.tf
@@ -10,10 +10,6 @@ output "environments" {
   value = local.environments
 }
 
-output "feature_flags" {
-  value = local.feature_flags
-}
-
 output "has_database" {
   value = local.has_database
 }
diff --git a/infra/analytics/database/main.tf b/infra/analytics/database/main.tf
index a2c7d80cc..cb2324a3b 100644
--- a/infra/analytics/database/main.tf
+++ b/infra/analytics/database/main.tf
@@ -78,6 +78,7 @@ data "aws_security_groups" "aws_services" {
 module "database" {
   source                      = "../../modules/database"
   name                        = "${local.prefix}${local.database_config.cluster_name}"
+  access_policy_name          = "${local.prefix}${local.database_config.access_policy_name}"
   app_access_policy_name      = "${local.prefix}${local.database_config.app_access_policy_name}"
   migrator_access_policy_name = "${local.prefix}${local.database_config.migrator_access_policy_name}"
   # The following are not AWS infra resources and therefore do not need to be
diff --git a/infra/api/app-config/main.tf b/infra/api/app-config/main.tf
index 6900cfafe..4056af138 100644
--- a/infra/api/app-config/main.tf
+++ b/infra/api/app-config/main.tf
@@ -5,7 +5,11 @@ locals {
   has_database                    = true
   has_incident_management_service = false
 
-  feature_flags = ["foo", "bar"]
+  # Whether or not the application depends on external non-AWS services.
+  # If enabled, the networks associated with this application's environments
+  # will have NAT gateways, which allows the service in the private subnet to
+  # make calls to the internet.
+  has_external_non_aws_service = true
 
   environment_configs = {
     dev     = module.dev_config
diff --git a/infra/api/app-config/outputs.tf b/infra/api/app-config/outputs.tf
index 4da2bc30d..4da929e1b 100644
--- a/infra/api/app-config/outputs.tf
+++ b/infra/api/app-config/outputs.tf
@@ -10,10 +10,6 @@ output "environments" {
   value = local.environments
 }
 
-output "feature_flags" {
-  value = local.feature_flags
-}
-
 output "has_database" {
   value = local.has_database
 }
diff --git a/infra/frontend/app-config/main.tf b/infra/frontend/app-config/main.tf
index c87de50cd..a54af1fe9 100644
--- a/infra/frontend/app-config/main.tf
+++ b/infra/frontend/app-config/main.tf
@@ -16,14 +16,12 @@ locals {
   # If enabled, the networks associated with this application's environments
   # will have NAT gateways, which allows the service in the private subnet to
   # make calls to the internet.
-  has_external_non_aws_service = false
+  has_external_non_aws_service = true
 
   has_incident_management_service = false
   enable_autoscaling              = true
   hostname                        = "0.0.0.0"
 
-  feature_flags = ["foo", "bar"]
-
   environment_configs = {
     dev     = module.dev_config
     staging = module.staging_config
diff --git a/infra/frontend/app-config/outputs.tf b/infra/frontend/app-config/outputs.tf
index b7ef31b06..c2e6928b1 100644
--- a/infra/frontend/app-config/outputs.tf
+++ b/infra/frontend/app-config/outputs.tf
@@ -10,10 +10,6 @@ output "environments" {
   value = local.environments
 }
 
-output "feature_flags" {
-  value = local.feature_flags
-}
-
 output "has_database" {
   value = local.has_database
 }