diff --git a/terraform/modules/csb/iam.tf b/terraform/modules/csb/iam.tf
index b3c49c397..cd2c00626 100644
--- a/terraform/modules/csb/iam.tf
+++ b/terraform/modules/csb/iam.tf
@@ -56,7 +56,7 @@ data "aws_iam_policy_document" "brokerpak_smtp" {
 }
 
 resource "aws_iam_policy" "brokerpak_smtp" {
-  name        = "brokerpak_smtp"
+  name        = "${var.stack_description}-brokerpak-smtp"
   description = "SMTP broker policy (covers SES, IAM, and supplementary Route53)"
   policy      = data.aws_iam_policy_document.brokerpak_smtp.json
 }
diff --git a/terraform/stacks/main/stack.tf b/terraform/stacks/main/stack.tf
index 80561438e..998e613bd 100644
--- a/terraform/stacks/main/stack.tf
+++ b/terraform/stacks/main/stack.tf
@@ -434,9 +434,6 @@ module "sns" {
 }
 
 module "csb" {
-  // Deploy only to development while iterating.
-  // See progress at https://github.com/cloud-gov/product/issues/2512.
-  count  = var.stack_description == "development" ? 1 : 0
   source = "../../modules/csb"
 
   stack_description = var.stack_description