diff --git a/incubator/parse/templates/NOTES.txt b/incubator/parse/templates/NOTES.txt
index 719420d49..11b1b5cd2 100644
--- a/incubator/parse/templates/NOTES.txt
+++ b/incubator/parse/templates/NOTES.txt
@@ -7,25 +7,22 @@ Parse Server
 
   export NODE_PORT=$(kubectl get svc --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" {{ template "fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  export SERVICE_IP=http://$NODE_IP:$NODE_PORT
+  export SERVICE_IP=$NODE_IP:$NODE_PORT
 
 {{- else if contains "LoadBalancer" .Values.serviceType }}
 
   NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-        Watch the status with: 'kubectl get svc -w {{ template "fullname" . }}'
+        Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}'
 
   export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}'):{{ .Values.parseServer.port }}
 {{- else if contains "ClusterIP"  .Values.serviceType }}
 
   export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "fullname" . }},component={{ .Chart.Name }}-server" -o jsonpath="{.items[0].metadata.name}")
-  export SERVICE_IP=http://127.0.0.1:1337
-  kubectl port-forward $POD_NAME 1337:1337
+  kubectl port-forward $POD_NAME {{ .Values.parseServer.port }}:{{ .Values.parseServer.port }}
+  export SERVICE_IP=127.0.0.1:{{ .Values.parseServer.port }}
+
 {{- end }}
 
-2. Get the Master Key for your Parse Server
-
-  echo $(printf $(printf '\%o' `kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.master-key[*]}"`))
-
 Example Usage:
 
   curl -X POST \
@@ -49,30 +46,31 @@ service:
 1. Get the Parse Server URL by running:
 
   NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-        Watch the status with: 'kubectl get svc -w {{ template "fullname" . }}'
+        Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}'
 
   export APP_HOST=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
 
 2. Complete your Parse Dashboard deployment by running:
 
   helm upgrade {{ .Release.Name }} \
-    --set parseHost=$APP_HOST stable/parse
+    --set parseServer.host=$APP_HOST,parseServer.port={{ .Values.parseServer.port }} stable/parse
+
 {{ else }}
 1. Get the Parse Dashboard URL by running:
 
 {{- if eq .Values.serviceType "ClusterIP" }}
 
   export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "fullname" . }},component={{ .Chart.Name }}-dashboard" -o jsonpath="{.items[0].metadata.name}")
-  echo http://127.0.0.1:8080/
-  kubectl port-forward $POD_NAME 8080:80
+  echo http://127.0.0.1:4040/
+  kubectl port-forward $POD_NAME 4040:4040
 {{- else }}
 
-  echo http://{{ include "host" . }}{{ if .Values.owncloudPort }}:{{ .Values.owncloudPort  }}{{ end }}/
+  echo http://{{ include "host" . }}/
 {{- end }}
 
 2. Get your Parsh Dashboard login credentials by running:
 
-  echo Email:    {{ .Values.parseDashboard.username }}
+  echo Username: {{ .Values.parseDashboard.username }}
   echo Password: $(printf $(printf '\%o' `kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.dashboard-password[*]}"`))
 {{- end }}
 {{- end }}
diff --git a/incubator/parse/templates/_helpers.tpl b/incubator/parse/templates/_helpers.tpl
index 674904dae..be3a51a92 100644
--- a/incubator/parse/templates/_helpers.tpl
+++ b/incubator/parse/templates/_helpers.tpl
@@ -31,7 +31,7 @@ Note, returns 127.0.0.1 if using ClusterIP.
 {{- if eq .Values.serviceType "ClusterIP" -}}
 127.0.0.1
 {{- else -}}
-{{- index .Values (printf "%sLoadBalancerIP" .Chart.Name) | default "" -}}
+{{- default "" .Values.parseServer.loadBalancerIP -}}
 {{- end -}}
 {{- end -}}
 
@@ -40,6 +40,6 @@ Gets the host to be used for this application.
 If not using ClusterIP, or if a host or LoadBalancerIP is not defined, the value will be empty.
 */}}
 {{- define "host" -}}
-{{- $host := index .Values (printf "%sHost" .Chart.Name) | default "" -}}
+{{- $host := default "" .Values.parseServer.host -}}
 {{- default (include "serviceIP" .) $host -}}
 {{- end -}}
diff --git a/incubator/parse/templates/server-deployment.yaml b/incubator/parse/templates/server-deployment.yaml
index 3694734b0..1991db5fc 100644
--- a/incubator/parse/templates/server-deployment.yaml
+++ b/incubator/parse/templates/server-deployment.yaml
@@ -39,7 +39,7 @@ spec:
           value: "27017"
         ports:
         - name: server-http
-          containerPort: 1337
+          containerPort: {{ .Values.parseServer.port }}
         # livenessProbe:
           # httpGet:
             # path: /