diff --git a/roles/deploy-kubeadm-aio-common/tasks/util-kubeadm-aio-run.yaml b/roles/deploy-kubeadm-aio-common/tasks/util-kubeadm-aio-run.yaml
index af4819d4c..0c5c11170 100644
--- a/roles/deploy-kubeadm-aio-common/tasks/util-kubeadm-aio-run.yaml
+++ b/roles/deploy-kubeadm-aio-common/tasks/util-kubeadm-aio-run.yaml
@@ -74,3 +74,10 @@
       docker_container:
         name: "kubeadm-{{ kubeadm_aio_action }}"
         state: absent
+    - name: add labels to namespaces
+      command: kubectl label --overwrite namespace {{ item }} name={{ item }}
+      with_items:
+        - default
+        - kube-system
+        - kube-public
+      ignore_errors: True
diff --git a/tools/deployment/common/005-deploy-k8s.sh b/tools/deployment/common/005-deploy-k8s.sh
index e78d949c0..b67e5e92f 100755
--- a/tools/deployment/common/005-deploy-k8s.sh
+++ b/tools/deployment/common/005-deploy-k8s.sh
@@ -235,3 +235,8 @@ kubectl label nodes --all ceph-osd=enabled
 kubectl label nodes --all ceph-mds=enabled
 kubectl label nodes --all ceph-rgw=enabled
 kubectl label nodes --all ceph-mgr=enabled
+
+# Add labels to the core namespaces
+kubectl label --overwrite namespace default name=default
+kubectl label --overwrite namespace kube-system name=kube-system
+kubectl label --overwrite namespace kube-public name=kube-public