diff --git a/apps/cloudflare-one-casb/package.json b/apps/cloudflare-one-casb/package.json
index 167100db..d334757c 100644
--- a/apps/cloudflare-one-casb/package.json
+++ b/apps/cloudflare-one-casb/package.json
@@ -5,7 +5,7 @@
 	"scripts": {
 		"check:lint": "run-eslint-workers",
 		"check:types": "run-tsc",
-		"deploy": "wrangler deploy",
+		"deploy": "run-wrangler-deploy",
 		"dev": "wrangler dev",
 		"start": "wrangler dev",
 		"types": "wrangler types --include-env=false",
diff --git a/apps/cloudflare-one-casb/wrangler.jsonc b/apps/cloudflare-one-casb/wrangler.jsonc
index e8784458..bdec102c 100644
--- a/apps/cloudflare-one-casb/wrangler.jsonc
+++ b/apps/cloudflare-one-casb/wrangler.jsonc
@@ -20,9 +20,9 @@
 		"MCP_SERVER_NAME": "PLACEHOLDER",
 		"MCP_SERVER_VERSION": "PLACEHOLDER",
 		"CLOUDFLARE_CLIENT_ID": "<PLACEHOLDER>",
-		"CLOUDFLARE_CLIENT_SECRET": "<PLACEHOLDER>"
+		"CLOUDFLARE_CLIENT_SECRET": "<PLACEHOLDER>",
+		"ENVIRONMENT": "development"
 	},
-
 	"dev": {
 		"port": 8976
 	},
@@ -81,7 +81,10 @@
 					"binding": "MCP_METRICS",
 					"dataset": "mcp-metrics-staging"
 				}
-			]
+			],
+			"vars": {
+				"ENVIRONMENT": "staging"
+			}
 		},
 		"production": {
 			"name": "mcp-cloudflare-casb-production",
@@ -111,7 +114,10 @@
 					"binding": "MCP_METRICS",
 					"dataset": "mcp-metrics-production"
 				}
-			]
+			],
+			"vars": {
+				"ENVIRONMENT": "production"
+			}
 		}
 	}
 }
diff --git a/apps/dex-analysis/package.json b/apps/dex-analysis/package.json
index e0d481b7..1a21a39a 100644
--- a/apps/dex-analysis/package.json
+++ b/apps/dex-analysis/package.json
@@ -5,7 +5,7 @@
 	"scripts": {
 		"check:lint": "run-eslint-workers",
 		"check:types": "run-tsc",
-		"deploy": "wrangler deploy",
+		"deploy": "run-wrangler-deploy",
 		"dev": "wrangler dev",
 		"start": "wrangler dev",
 		"types": "wrangler types --include-env=false",