diff --git a/environments/staging-and-prod/locals.tf b/environments/staging-and-prod/locals.tf
index 36ae229..508ad1d 100644
--- a/environments/staging-and-prod/locals.tf
+++ b/environments/staging-and-prod/locals.tf
@@ -85,13 +85,13 @@ locals {
   s3_websites = {
     for _, config in local.s3_websites_config :
     _ => merge(config, {
-      subdomain = config.subdomain == "www" ? var.environment == "prod" ? config.subdomain : local.env_subdomain_prefix : "${local.env_subdomain_prefix}${config.subdomain}"
+      subdomain = config.subdomain == "www" ? var.environment == "prod" ? config.subdomain : var.environment : "${local.env_subdomain_prefix}${config.subdomain}"
     })
   }
   fargate_services = {
     for _, config in local.fargate_services_config :
     _ => merge(config, {
-      subdomain = config.subdomain == "www" ? var.environment == "prod" ? config.subdomain : local.env_subdomain_prefix : "${local.env_subdomain_prefix}${config.subdomain}"
+      subdomain = config.subdomain == "www" ? var.environment == "prod" ? config.subdomain : var.environment : "${local.env_subdomain_prefix}${config.subdomain}"
     })
   }
 
diff --git a/modules/cloudflare/main.tf b/modules/cloudflare/main.tf
index 901d552..2e72734 100644
--- a/modules/cloudflare/main.tf
+++ b/modules/cloudflare/main.tf
@@ -24,7 +24,7 @@ locals {
           action_parameters = {
             ssl = app.cloudflare.ssl_mode
           }
-          expression  = app.subdomain == "www" && env == "prod" ? "(http.host eq \"${app.root_domain}\" or http.host eq \"${app.subdomain}.${app.root_domain}\")" : "(http.host eq \"${env == "prod" ? "" : "${env}."}${app.subdomain}.${app.root_domain}\")"
+          expression  = app.subdomain == "www" && env == "prod" ? "(http.host eq \"${app.root_domain}\" or http.host eq \"${app.subdomain}.${app.root_domain}\")" : "(http.host eq \"${app.subdomain == "www" ? "${env}.${app.root_domain}" : "${env}.${app.subdomain}.${app.root_domain}"}\")"
           description = "Cloudflare rules for ${app.app_name} (${env})"
         }] : []
       ])