diff --git a/infra/cdn/variables.tf b/infra/cdn/variables.tf
index ec0a11a83..44547fe37 100644
--- a/infra/cdn/variables.tf
+++ b/infra/cdn/variables.tf
@@ -62,7 +62,7 @@ variable "ngwaf_site_name" {
   description = "Site SHORT name for NGWAF"
 
   validation {
-    condition     = can(regex("^(test|stage|prod)$", var.ngwaf_site_name))
+    condition     = can(regex("^(pythondotorg-test|pythondotorg-prod)$", var.ngwaf_site_name))
     error_message = "'ngwaf_site_name' must be one of the following: test, stage, or prod"
   }
 }
diff --git a/infra/main.tf b/infra/main.tf
index 90c2ba9c5..0966d2d10 100644
--- a/infra/main.tf
+++ b/infra/main.tf
@@ -13,7 +13,7 @@ module "fastly_production" {
   fastly_header_token = var.FASTLY_HEADER_TOKEN
   s3_logging_keys     = var.fastly_s3_logging
 
-  ngwaf_site_name        = "prod"
+  ngwaf_site_name        = "pythondotorg-prod"
   ngwaf_email            = "infrastructure-staff@python.org"
   ngwaf_token            = var.ngwaf_token
   activate_ngwaf_service = false
@@ -35,7 +35,7 @@ module "fastly_staging" {
   fastly_header_token = var.FASTLY_HEADER_TOKEN
   s3_logging_keys     = var.fastly_s3_logging
 
-  ngwaf_site_name        = "test"
+  ngwaf_site_name        = "pythondotorg-test"
   ngwaf_email            = "infrastructure-staff@python.org"
   ngwaf_token            = var.ngwaf_token
   activate_ngwaf_service = true