diff --git a/docs/deployment/production.md b/docs/deployment/production.md
index a4af452..ae7656a 100644
--- a/docs/deployment/production.md
+++ b/docs/deployment/production.md
@@ -160,7 +160,7 @@ spec:
     - from:
         - namespaceSelector:
             matchLabels:
-              kubernetes.io/metadata.name: kube-system
+              kubernetes.io/metadata.name: headlamp
         - podSelector:
             matchLabels:
               component: kube-apiserver
diff --git a/docs/troubleshooting/network-problems.md b/docs/troubleshooting/network-problems.md
index 08817be..cada81e 100644
--- a/docs/troubleshooting/network-problems.md
+++ b/docs/troubleshooting/network-problems.md
@@ -41,7 +41,7 @@ spec:
     - from:
         - namespaceSelector:
             matchLabels:
-              kubernetes.io/metadata.name: kube-system
+              kubernetes.io/metadata.name: headlamp
         - podSelector:
             matchLabels:
               component: kube-apiserver
diff --git a/docs/user-guide/rbac-permissions.md b/docs/user-guide/rbac-permissions.md
index 4a51ede..07e2a3f 100644
--- a/docs/user-guide/rbac-permissions.md
+++ b/docs/user-guide/rbac-permissions.md
@@ -318,7 +318,7 @@ spec:
     - from:
         - namespaceSelector:
             matchLabels:
-              kubernetes.io/metadata.name: kube-system
+              kubernetes.io/metadata.name: headlamp
         - podSelector:
             matchLabels:
               component: kube-apiserver
diff --git a/e2e/README.md b/e2e/README.md
index b93d390..b7ae56e 100644
--- a/e2e/README.md
+++ b/e2e/README.md
@@ -41,8 +41,8 @@ The default base URL is `https://headlamp.animaniacs.farh.net`. Override with `H
 ### Option 2: K8s bearer token (port-forward)
 
 ```bash
-kubectl port-forward -n kube-system svc/headlamp 4466:80
-export HEADLAMP_TOKEN=$(kubectl create token headlamp -n kube-system)
+kubectl port-forward -n headlamp svc/headlamp 4466:80
+export HEADLAMP_TOKEN=$(kubectl create token headlamp -n headlamp)
 HEADLAMP_URL=http://localhost:4466 npm run e2e
 ```
 
@@ -143,7 +143,7 @@ cp .env.example .env
 
 # 3. Set environment variables
 export HEADLAMP_URL=https://your-headlamp-instance.com
-export HEADLAMP_TOKEN=$(kubectl create token headlamp -n kube-system)
+export HEADLAMP_TOKEN=$(kubectl create token headlamp -n headlamp)
 
 # 4. Run tests
 npm run e2e