diff --git a/build/cicd/internal/config/config.go b/build/cicd/internal/config/config.go
index 44009be..e9c59aa 100644
--- a/build/cicd/internal/config/config.go
+++ b/build/cicd/internal/config/config.go
@@ -395,6 +395,7 @@ func (cfgCtx *ConfigContext) Config(log *log.Logger) (*devdeploy.Config, error)
 						"ecs:UpdateService",
 						"ses:SendEmail",
 						"ses:ListIdentities",
+						"ses:GetAccountSendingEnabled",
 						"secretsmanager:ListSecretVersionIds",
 						"secretsmanager:GetSecretValue",
 						"secretsmanager:CreateSecret",
diff --git a/build/cicd/internal/config/service.go b/build/cicd/internal/config/service.go
index 49c11c7..488b4ee 100644
--- a/build/cicd/internal/config/service.go
+++ b/build/cicd/internal/config/service.go
@@ -266,23 +266,23 @@ func NewServiceContext(serviceName Service, cfg *devdeploy.Config) (*ServiceCont
 				ecsKeyValuePair("PROJECT_NAME", cfg.ProjectName),
 
 				// Use placeholders for these environment variables that will be replaced with devdeploy.DeployServiceToTargetEnv
-				ecsKeyValuePair("WEB_API_SERVICE_HOST", "{HTTP_HOST}"),
-				ecsKeyValuePair("WEB_API_SERVICE_HTTPS_HOST", "{HTTPS_HOST}"),
-				ecsKeyValuePair("WEB_API_SERVICE_ENABLE_HTTPS", "{HTTPS_ENABLED}"),
-				ecsKeyValuePair("WEB_API_SERVICE_BASE_URL", "{APP_BASE_URL}"),
-				ecsKeyValuePair("WEB_API_SERVICE_HOST_NAMES", "{HOST_NAMES}"),
-				ecsKeyValuePair("WEB_API_SERVICE_STATICFILES_S3_ENABLED", "{STATIC_FILES_S3_ENABLED}"),
-				ecsKeyValuePair("WEB_API_SERVICE_STATICFILES_S3_PREFIX", "{STATIC_FILES_S3_PREFIX}"),
-				ecsKeyValuePair("WEB_API_SERVICE_STATICFILES_CLOUDFRONT_ENABLED", "{STATIC_FILES_CLOUDFRONT_ENABLED}"),
-				ecsKeyValuePair("WEB_API_REDIS_HOST", "{CACHE_HOST}"),
-				ecsKeyValuePair("WEB_API_DB_HOST", "{DB_HOST}"),
-				ecsKeyValuePair("WEB_API_DB_USERNAME", "{DB_USER}"),
-				ecsKeyValuePair("WEB_API_DB_PASSWORD", "{DB_PASS}"),
-				ecsKeyValuePair("WEB_API_DB_DATABASE", "{DB_DATABASE}"),
-				ecsKeyValuePair("WEB_API_DB_DRIVER", "{DB_DRIVER}"),
-				ecsKeyValuePair("WEB_API_DB_DISABLE_TLS", "{DB_DISABLE_TLS}"),
-				ecsKeyValuePair("WEB_API_AWS_S3_BUCKET_PRIVATE", "{AWS_S3_BUCKET_PRIVATE}"),
-				ecsKeyValuePair("WEB_API_AWS_S3_BUCKET_PUBLIC", "{AWS_S3_BUCKET_PUBLIC}"),
+				ecsKeyValuePair("WEB_APP_HOST_HOST", "{HTTP_HOST}"),
+				ecsKeyValuePair("WEB_APP_HTTPS_HOST", "{HTTPS_HOST}"),
+				ecsKeyValuePair("WEB_APP_SERVICE_ENABLE_HTTPS", "{HTTPS_ENABLED}"),
+				ecsKeyValuePair("WEB_APP_SERVICE_BASE_URL", "{APP_BASE_URL}"),
+				ecsKeyValuePair("WEB_APP_SERVICE_HOST_NAMES", "{HOST_NAMES}"),
+				ecsKeyValuePair("WEB_APP_SERVICE_STATICFILES_S3_ENABLED", "{STATIC_FILES_S3_ENABLED}"),
+				ecsKeyValuePair("WEB_APP_SERVICE_STATICFILES_S3_PREFIX", "{STATIC_FILES_S3_PREFIX}"),
+				ecsKeyValuePair("WEB_APP_SERVICE_STATICFILES_CLOUDFRONT_ENABLED", "{STATIC_FILES_CLOUDFRONT_ENABLED}"),
+				ecsKeyValuePair("WEB_APP_REDIS_HOST", "{CACHE_HOST}"),
+				ecsKeyValuePair("WEB_APP_DB_HOST", "{DB_HOST}"),
+				ecsKeyValuePair("WEB_APP_DB_USERNAME", "{DB_USER}"),
+				ecsKeyValuePair("WEB_APP_DB_PASSWORD", "{DB_PASS}"),
+				ecsKeyValuePair("WEB_APP_DB_DATABASE", "{DB_DATABASE}"),
+				ecsKeyValuePair("WEB_APP_DB_DRIVER", "{DB_DRIVER}"),
+				ecsKeyValuePair("WEB_APP_DB_DISABLE_TLS", "{DB_DISABLE_TLS}"),
+				ecsKeyValuePair("WEB_APP_AWS_S3_BUCKET_PRIVATE", "{AWS_S3_BUCKET_PRIVATE}"),
+				ecsKeyValuePair("WEB_APP_AWS_S3_BUCKET_PUBLIC", "{AWS_S3_BUCKET_PUBLIC}"),
 				ecsKeyValuePair(devdeploy.ENV_KEY_ROUTE53_UPDATE_TASK_IPS, "{ROUTE53_UPDATE_TASK_IPS}"),
 				ecsKeyValuePair(devdeploy.ENV_KEY_ROUTE53_ZONES, "{ROUTE53_ZONES}"),
 			)
@@ -372,8 +372,8 @@ func NewServiceContext(serviceName Service, cfg *devdeploy.Config) (*ServiceCont
 				ecsKeyValuePair("PROJECT_NAME", cfg.ProjectName),
 
 				// Use placeholders for these environment variables that will be replaced with devdeploy.DeployServiceToTargetEnv
-				ecsKeyValuePair("WEB_API_SERVICE_HOST", "{HTTP_HOST}"),
-				ecsKeyValuePair("WEB_API_SERVICE_HTTPS_HOST", "{HTTPS_HOST}"),
+				ecsKeyValuePair("WEB_API_HTTP_HOST", "{HTTP_HOST}"),
+				ecsKeyValuePair("WEB_API_HTTPS_HOST", "{HTTPS_HOST}"),
 				ecsKeyValuePair("WEB_API_SERVICE_ENABLE_HTTPS", "{HTTPS_ENABLED}"),
 				ecsKeyValuePair("WEB_API_SERVICE_BASE_URL", "{APP_BASE_URL}"),
 				ecsKeyValuePair("WEB_API_SERVICE_HOST_NAMES", "{HOST_NAMES}"),