diff --git a/k8s/operator/etcd/cluster_role_binding.yml b/k8s/operator/etcd/cluster_role_binding.yml
index 707463f..ce32037 100644
--- a/k8s/operator/etcd/cluster_role_binding.yml
+++ b/k8s/operator/etcd/cluster_role_binding.yml
@@ -9,5 +9,4 @@
 subjects:
 - kind: ServiceAccount
   name: default
-  namespace: default
-
+  namespace: voltha
diff --git a/k8s/operator/etcd/etcd_cluster.yml b/k8s/operator/etcd/etcd_cluster.yml
index af6aa03..904588e 100644
--- a/k8s/operator/etcd/etcd_cluster.yml
+++ b/k8s/operator/etcd/etcd_cluster.yml
@@ -1,7 +1,8 @@
 apiVersion: "etcd.database.coreos.com/v1beta2"
 kind: "EtcdCluster"
 metadata:
-  name: "etcd"
+  name: etcd
+  namespace: voltha
 spec:
   size: 3
   version: "3.2.9"
diff --git a/k8s/operator/etcd/operator.yml b/k8s/operator/etcd/operator.yml
index 4e6d679..7e51944 100644
--- a/k8s/operator/etcd/operator.yml
+++ b/k8s/operator/etcd/operator.yml
@@ -2,6 +2,7 @@
 kind: Deployment
 metadata:
   name: etcd-operator
+  namespace: voltha
 spec:
   replicas: 1
   template: