diff --git a/cmd/kubevpn/cmds/serve.go b/cmd/kubevpn/cmds/serve.go
index bbbd03fc..1f354824 100644
--- a/cmd/kubevpn/cmds/serve.go
+++ b/cmd/kubevpn/cmds/serve.go
@@ -38,9 +38,6 @@ func CmdServe(factory cmdutil.Factory) *cobra.Command {
 				}
 				namespace, found, _ := factory.ToRawKubeConfigLoader().Namespace()
 				if !found {
-					namespace = os.Getenv(config.EnvNamespace)
-				}
-				if namespace == "" {
 					return fmt.Errorf("can not get namespace")
 				}
 				cmi := clientset.CoreV1().ConfigMaps(namespace)
@@ -85,9 +82,6 @@ func CmdServe(factory cmdutil.Factory) *cobra.Command {
 			}
 			namespace, found, _ := factory.ToRawKubeConfigLoader().Namespace()
 			if !found {
-				namespace = os.Getenv(config.EnvNamespace)
-			}
-			if namespace == "" {
 				return fmt.Errorf("can not get namespace")
 			}
 			cmi := clientset.CoreV1().ConfigMaps(namespace)
diff --git a/pkg/config/config.go b/pkg/config/config.go
index 6195b343..8c1d590e 100644
--- a/pkg/config/config.go
+++ b/pkg/config/config.go
@@ -33,7 +33,6 @@ const (
 	// env name
 	EnvTunNameOrLUID   = "TunNameOrLUID"
 	EnvInboundPodTunIP = "InboundPodTunIP"
-	EnvNamespace       = "Namespace"
 )
 
 var (
diff --git a/pkg/mesh/controller.go b/pkg/mesh/controller.go
index 1c24785c..f8b5dd94 100644
--- a/pkg/mesh/controller.go
+++ b/pkg/mesh/controller.go
@@ -54,8 +54,12 @@ kubevpn serve -L "tun:/${TrafficManagerRealIP}:8422?net=${InboundPodTunIP}&route
 				Value: c.InboundPodTunIP,
 			},
 			{
-				Name:  config.EnvNamespace,
-				Value: ns,
+				Name: "POD_NAMESPACE",
+				ValueFrom: &v1.EnvVarSource{
+					FieldRef: &v1.ObjectFieldSelector{
+						FieldPath: "metadata.namespace",
+					},
+				},
 			},
 		},
 		SecurityContext: &v1.SecurityContext{