diff --git a/stable/parse/Chart.yaml b/stable/parse/Chart.yaml
index 0826f91748..b0dbd4c667 100644
--- a/stable/parse/Chart.yaml
+++ b/stable/parse/Chart.yaml
@@ -1,5 +1,5 @@
 name: parse
-version: 5.0.1
+version: 5.0.2
 appVersion: 3.1.2
 description: Parse is a platform that enables users to add a scalable and powerful backend to launch a full-featured app for iOS, Android, JavaScript, Windows, Unity, and more.
 keywords:
diff --git a/stable/parse/templates/NOTES.txt b/stable/parse/templates/NOTES.txt
index 90df2cea96..79e9b7fa15 100644
--- a/stable/parse/templates/NOTES.txt
+++ b/stable/parse/templates/NOTES.txt
@@ -24,8 +24,9 @@ Parse Server
 
 {{- else if contains "ClusterIP"  .Values.service.type }}
 
-  kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "parse.fullname" . }} {{ .Values.server.port }}:{{ .Values.server.port }}
-  export SERVICE_IP=127.0.0.1:{{ .Values.server.port }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l app={{ template "parse.name" . }},component=server -o jsonpath="{.items[0].metadata.name}")
+  kubectl port-forward --namespace {{ .Release.Namespace }} $POD_NAME 1337:1337 &
+  export SERVICE_IP=127.0.0.1:1337
 
 {{- end }}
 
@@ -67,7 +68,8 @@ service:
 {{- if eq .Values.service.type "ClusterIP" }}
 
   echo "Parse Dashboard URL: http://127.0.0.1:4040/"
-  kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "parse.fullname" . }} 4040:4040
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l app={{ template "parse.name" . }},component=dashboard -o jsonpath="{.items[0].metadata.name}")
+  kubectl port-forward --namespace {{ .Release.Namespace }} $POD_NAME 4040:4040 &
 
 {{- else }}