diff --git a/bbsim/Chart.yaml b/bbsim/Chart.yaml
index e8fd8e0..75affdf 100644
--- a/bbsim/Chart.yaml
+++ b/bbsim/Chart.yaml
@@ -16,5 +16,5 @@
 description: Broadband Simulator
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 3.0.13
+version: 3.0.14
 appVersion: 0.0.16
diff --git a/bbsim/templates/deployment.yaml b/bbsim/templates/deployment.yaml
index 99c4015..729e50c 100644
--- a/bbsim/templates/deployment.yaml
+++ b/bbsim/templates/deployment.yaml
@@ -17,7 +17,7 @@
 kind: Deployment
 metadata:
   name: {{ template "bbsim.fullname" . }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "bbsim.name" . }}
     chart: {{ template "bbsim.chart" . }}
diff --git a/bbsim/templates/service.yaml b/bbsim/templates/service.yaml
index b27e169..6070ffb 100644
--- a/bbsim/templates/service.yaml
+++ b/bbsim/templates/service.yaml
@@ -17,7 +17,7 @@
 kind: Service
 metadata:
   name: {{ template "bbsim.fullname" . }}
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     app: {{ template "bbsim.name" . }}
     chart: {{ template "bbsim.chart" . }}
diff --git a/bbsim/values.yaml b/bbsim/values.yaml
index 7aeed41..44ef698 100644
--- a/bbsim/values.yaml
+++ b/bbsim/values.yaml
@@ -38,7 +38,6 @@
 global:
   registry: ''
 
-namespace: voltha
 serviceAccountName: default
 
 nameOverride: ""