diff --git a/onos/Chart.yaml b/onos/Chart.yaml
index d647b55..39e87f8 100644
--- a/onos/Chart.yaml
+++ b/onos/Chart.yaml
@@ -15,6 +15,6 @@
 
 name: onos
 description: Open Network Operating System
-version: 1.1.3
+version: 1.1.4
 icon: https://guide.opencord.org/logos/onos.svg
 appVersion: 1.13.9
diff --git a/onos/templates/deployment.yaml b/onos/templates/deployment.yaml
index 499a821..fc6c014 100644
--- a/onos/templates/deployment.yaml
+++ b/onos/templates/deployment.yaml
@@ -17,7 +17,6 @@
 kind: Deployment
 metadata:
   name: {{ template "onos.fullname" . }}
-  namespace: {{ .Values.namespace }}
   labels:
     app: {{ template "onos.name" . }}
     chart: {{ template "onos.chart" . }}
diff --git a/onos/values.yaml b/onos/values.yaml
index 57fb42f..fbfe6eb 100644
--- a/onos/values.yaml
+++ b/onos/values.yaml
@@ -43,7 +43,6 @@
 
 xos_service_label: ONOS
 
-namespace: default
 serviceAccountName: default
 
 services:
diff --git a/xos-core/Chart.yaml b/xos-core/Chart.yaml
index 412fb24..d0557ed 100644
--- a/xos-core/Chart.yaml
+++ b/xos-core/Chart.yaml
@@ -17,7 +17,7 @@
 description: XOS - An Extensible Cloud Operating System
 icon: https://guide.opencord.org/logos/xos.svg
 
-version: 3.0.10
+version: 3.0.11
 
 # appVersion is of the xos-core containers.
 # xos-tosca, xos-chameleon, and xos-api-tester are versioned in values.yaml
diff --git a/xos-core/requirements.yaml b/xos-core/requirements.yaml
index 8a4f757..be4639b 100644
--- a/xos-core/requirements.yaml
+++ b/xos-core/requirements.yaml
@@ -15,7 +15,7 @@
 
 dependencies:
 - name: xos-db
-  version: 1.0.1
+  version: 1.0.2
   repository: file://../xos-db
 - name: xos-gui
   version: 1.2.7
diff --git a/xos-core/templates/50-rbac.yaml b/xos-core/templates/50-rbac.yaml
index 7e983b4..fd4bde0 100644
--- a/xos-core/templates/50-rbac.yaml
+++ b/xos-core/templates/50-rbac.yaml
@@ -17,10 +17,7 @@
 kind: ServiceAccount
 metadata:
   name: kubernetes-synchronizer
-
-...
 ---
-
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: ClusterRoleBinding
 metadata:
@@ -32,4 +29,4 @@
 subjects:
   - kind: ServiceAccount
     name: kubernetes-synchronizer
-    namespace: default
+    namespace: {{ .Release.Namespace }}
diff --git a/xos-core/templates/core-secrets.yaml b/xos-core/templates/core-secrets.yaml
index 9d5a7c5..ee7070e 100644
--- a/xos-core/templates/core-secrets.yaml
+++ b/xos-core/templates/core-secrets.yaml
@@ -17,7 +17,6 @@
 kind: Secret
 metadata:
   name: xos-admin-passwd-secret
-  namespace: default
 type: Opaque
 data:
   password: {{ .Values.xosAdminPassword | b64enc }}
diff --git a/xos-core/templates/coreapi-cert-secret.yaml b/xos-core/templates/coreapi-cert-secret.yaml
index b70cba6..52c4b8e 100644
--- a/xos-core/templates/coreapi-cert-secret.yaml
+++ b/xos-core/templates/coreapi-cert-secret.yaml
@@ -17,7 +17,6 @@
 kind: Secret
 metadata:
   name: coreapi-cert-secret
-  namespace: default
 type: kubernetes.io/tls
 data:
   tls.crt: {{ .Files.Get "pki/xos-core.pem" | b64enc }}
diff --git a/xos-db/Chart.yaml b/xos-db/Chart.yaml
index 9553ed9..52f4d7c 100644
--- a/xos-db/Chart.yaml
+++ b/xos-db/Chart.yaml
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 name: xos-db
-version: 1.0.1
+version: 1.0.2
 
 icon: https://www.postgresql.org/media/img/about/press/elephant.png
 
diff --git a/xos-db/templates/db-secrets.yaml b/xos-db/templates/db-secrets.yaml
index 9f41343..8abb96f 100644
--- a/xos-db/templates/db-secrets.yaml
+++ b/xos-db/templates/db-secrets.yaml
@@ -17,7 +17,6 @@
 kind: Secret
 metadata:
   name: xos-db-secrets
-  namespace: default
 type: Opaque
 data:
   password: {{ .Values.xosDBPassword | b64enc }}