diff --git a/infrastructure/dashboard/kubernetes-dashboard.yaml b/infrastructure/dashboard/kubernetes-dashboard.yaml
index d5c1a77b8d0c00926a2aae5b94aeb90217404292..443d44688115525c8ad5174439f0db1b835cfaad 100644
--- a/infrastructure/dashboard/kubernetes-dashboard.yaml
+++ b/infrastructure/dashboard/kubernetes-dashboard.yaml
@@ -275,7 +275,11 @@ spec:
               protocol: TCP
           args:
             - --enable-insecure-login
-            - --namespace=kubernetes-dashboard
+          env:
+            - name: POD_NAMESPACE
+              valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
           volumeMounts:
               # Create on-disk volume to store exec logs
             - mountPath: /tmp
@@ -327,6 +331,11 @@ spec:
         - name: kubernetes-dashboard-web
           image: docker.io/kubernetesui/dashboard-web:v1.0.0
           imagePullPolicy: IfNotPresent
+          env:
+            - name: POD_NAMESPACE
+              valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
           ports:
             - containerPort: 8000
               name: web
@@ -385,6 +394,11 @@ spec:
           ports:
             - containerPort: 8000
               protocol: TCP
+          env:
+            - name: POD_NAMESPACE
+              valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
           livenessProbe:
             httpGet:
               scheme: HTTP