diff --git a/Makefile b/Makefile
index 1dcf5c3..9078928 100644
--- a/Makefile
+++ b/Makefile
@@ -11,11 +11,11 @@ secrets:
 flux:
 	./scripts/flux-bootstrap.sh
 
-dev: kind namespaces secrets chisel velero
+dev: kind namespaces secrets velero chisel
 
 prod: echoenv namespaces secrets velero chisel flux
 
-staging: echoenv namespaces secrets velero flux
+staging: echoenv namespaces secrets velero chisel flux
 
 echoenv:
 	echo "[echoenv] Using ${ENV} environment. If this is not what you want, export ENV=development|staging|production"
diff --git a/charts/fp/templates/echo.yaml b/charts/fp/templates/echo.yaml
index c4cf6d6..0e89b21 100644
--- a/charts/fp/templates/echo.yaml
+++ b/charts/fp/templates/echo.yaml
@@ -38,6 +38,7 @@ spec:
       port: 8001
       targetPort: 5678
 
+{{ if eq .Values.environment "development" }}
 ---
 apiVersion: chisel-operator.io/v1
 kind: ExitNode
@@ -48,7 +49,7 @@ spec:
   host: "{{ .Values.chisel.exitNodeIp }}"
   port: 9090
   auth: chisel
-
+{{ end }}
 
 --- 
 apiVersion: networking.k8s.io/v1