diff --git a/charts/fission/README.md b/charts/fission/README.md
index 95fdf790..a4196919 100644
--- a/charts/fission/README.md
+++ b/charts/fission/README.md
@@ -35,7 +35,6 @@ The following table lists the configurable parameters of the Fission chart and t
 | `imageTag`          | Fission image tag                          | `alpha20170124`          |
 | `controllerPort`    | Fission Controller Service Port            | `31313`                  |
 | `routerPort`        | Fission Router Service Port                | `31314`                  |
-| `namespace`         | Namespace for Fission deployments/services | `fission`                |
 | `functionNamespace` | Namespace for Fission functions            | `fission-function`       |
 
 
diff --git a/charts/fission/templates/deployment.yaml b/charts/fission/templates/deployment.yaml
index 51e1e54c..4fea6f5f 100644
--- a/charts/fission/templates/deployment.yaml
+++ b/charts/fission/templates/deployment.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: {{ .Values.namespace }}
+  name: {{ .Release.Namespace }}
   labels:
     name: fission
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
@@ -20,7 +20,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: controller
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
 spec:
@@ -41,7 +41,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: router
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
 spec:
@@ -62,7 +62,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: poolmgr
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     svc: poolmgr
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
@@ -78,7 +78,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: poolmgr
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
 spec:
@@ -99,7 +99,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: kubewatcher
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
 spec:
@@ -120,7 +120,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: etcd
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     svc: etcd
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
@@ -136,7 +136,7 @@ apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: etcd
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
 spec:
diff --git a/charts/fission/templates/svc.yaml b/charts/fission/templates/svc.yaml
index d42da690..11659181 100644
--- a/charts/fission/templates/svc.yaml
+++ b/charts/fission/templates/svc.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: router
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     svc: router
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
@@ -20,7 +20,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: controller
-  namespace: {{ .Values.namespace }}
+  namespace: {{ .Release.Namespace }}
   labels:
     svc: controller
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
diff --git a/charts/fission/values.yaml b/charts/fission/values.yaml
index 2140b711..2100f2d2 100644
--- a/charts/fission/values.yaml
+++ b/charts/fission/values.yaml
@@ -3,22 +3,21 @@
 # 
 
 ## Kubernetes configuration
-## For minikube, set this to NodePort, elsewhere use LoadBalancer
-##
+## For minikube, set this to NodePort, elsewhere use LoadBalancer.
 serviceType: LoadBalancer
 
 ## Fission image repostiroy
 image: fission/fission-bundle
+
 ## Fission image version
 imageTag: alpha20170124
 
 ## Port at which Fission controller service should be exposed
 controllerPort: 31313
-## Port at which Fission controller service should be exposed
+
+## Port at which Fission router service should be exposed
 routerPort: 31314
 
-## Namespace in which to run fission deployments and services
-fissionNamespace: fission
-
-## Namespace in which to run fission functions
+## Namespace in which to run fission functions (this is different from
+## the release namespace)
 fissionFunctionNamespace: fission-function