diff --git a/stable/gitlab-ce/Chart.yaml b/stable/gitlab-ce/Chart.yaml
index b73ccb601ecd..7319f470c74d 100755
--- a/stable/gitlab-ce/Chart.yaml
+++ b/stable/gitlab-ce/Chart.yaml
@@ -1,5 +1,5 @@
 name: gitlab-ce
-version: 0.1.12
+version: 0.2.0
 description: GitLab Community Edition
 keywords:
 - git
diff --git a/stable/gitlab-ce/templates/NOTES.txt b/stable/gitlab-ce/templates/NOTES.txt
index 95ec017f0d96..d3413c4d70ee 100644
--- a/stable/gitlab-ce/templates/NOTES.txt
+++ b/stable/gitlab-ce/templates/NOTES.txt
@@ -9,13 +9,13 @@
 {{- 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 -w {{ template "gitlab-ce.fullname" . }}'
 
-  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "gitlab-ce.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
   echo http://$SERVICE_IP/
 {{- else if contains "ClusterIP"  .Values.serviceType }}
 
-  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "fullname" . }}" -o jsonpath="{.items[0].metadata.name}")
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "gitlab-ce.fullname" . }}" -o jsonpath="{.items[0].metadata.name}")
   echo http://127.0.0.1:8080/
   kubectl port-forward $POD_NAME 8080:80
 {{- end }}
diff --git a/stable/gitlab-ce/templates/_helpers.tpl b/stable/gitlab-ce/templates/_helpers.tpl
index 82671a790e26..4311ec3ac85c 100644
--- a/stable/gitlab-ce/templates/_helpers.tpl
+++ b/stable/gitlab-ce/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "name" -}}
+{{- define "gitlab-ce.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -10,7 +10,7 @@ Expand the name of the chart.
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
-{{- define "fullname" -}}
+{{- define "gitlab-ce.fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
@@ -19,7 +19,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 Create a default fully qualified postgresql name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
-{{- define "postgresql.fullname" -}}
+{{- define "gitlab-ce.postgresql.fullname" -}}
 {{- printf "%s-%s" .Release.Name "postgresql" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -27,6 +27,6 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 Create a default fully qualified redis name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
-{{- define "redis.fullname" -}}
+{{- define "gitlab-ce.redis.fullname" -}}
 {{- printf "%s-%s" .Release.Name "redis" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
diff --git a/stable/gitlab-ce/templates/configmap.yaml b/stable/gitlab-ce/templates/configmap.yaml
index d8f4770ceea8..7015aa01115e 100644
--- a/stable/gitlab-ce/templates/configmap.yaml
+++ b/stable/gitlab-ce/templates/configmap.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "gitlab-ce.fullname" . }}
   labels:
-    app: {{ template "fullname" . }}
+    app: {{ template "gitlab-ce.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
diff --git a/stable/gitlab-ce/templates/data-pvc.yaml b/stable/gitlab-ce/templates/data-pvc.yaml
index 31ada95fb2d3..d03bb01f6a58 100644
--- a/stable/gitlab-ce/templates/data-pvc.yaml
+++ b/stable/gitlab-ce/templates/data-pvc.yaml
@@ -2,7 +2,7 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ template "fullname" . }}-data
+  name: {{ template "gitlab-ce.fullname" . }}-data
   annotations:
   {{- if .Values.persistence.gitlabData.storageClass }}
     volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.gitlabData.storageClass | quote }}
diff --git a/stable/gitlab-ce/templates/deployment.yaml b/stable/gitlab-ce/templates/deployment.yaml
index fd5c0b787905..b8d7c8787c12 100644
--- a/stable/gitlab-ce/templates/deployment.yaml
+++ b/stable/gitlab-ce/templates/deployment.yaml
@@ -2,9 +2,9 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "gitlab-ce.fullname" . }}
   labels:
-    app: {{ template "fullname" . }}
+    app: {{ template "gitlab-ce.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
@@ -13,10 +13,10 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ template "fullname" . }}
+        app: {{ template "gitlab-ce.fullname" . }}
     spec:
       containers:
-      - name: {{ template "fullname" . }}
+      - name: {{ template "gitlab-ce.fullname" . }}
         image: {{ .Values.image }}
         imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }}
         env:
@@ -29,13 +29,13 @@ spec:
         - name: GITLAB_OMNIBUS_CONFIG
           valueFrom:
             configMapKeyRef:
-              name: {{ template "fullname" . }}
+              name: {{ template "gitlab-ce.fullname" . }}
               key: gitlab_omnibus_config
         - name: GITLAB_ROOT_PASSWORD
         {{- if default "" .Values.gitlabRootPassword }}
           valueFrom:
             secretKeyRef:
-              name: {{ template "fullname" . }}
+              name: {{ template "gitlab-ce.fullname" . }}
               key: gitlab-root-password
         {{ end }}
         - name: EXTERNAL_URL
@@ -43,27 +43,27 @@ spec:
         ## DB configuration
         ##
         - name: DB_HOST
-          value: {{ template "postgresql.fullname" . }}
+          value: {{ template "gitlab-ce.postgresql.fullname" . }}
         - name: DB_USER
           valueFrom:
             secretKeyRef:
-              name: {{ template "fullname" . }}
+              name: {{ template "gitlab-ce.fullname" . }}
               key: db-user
         - name: DB_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: {{ template "fullname" . }}
+              name: {{ template "gitlab-ce.fullname" . }}
               key: db-password
         - name: DB_DATABASE
           value: {{ .Values.postgresql.postgresDatabase | quote }}
         ## Redis configuration
         ##
         - name: REDIS_HOST
-          value: {{ template "redis.fullname" . }}
+          value: {{ template "gitlab-ce.redis.fullname" . }}
         - name: REDIS_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: {{ template "fullname" . }}
+              name: {{ template "gitlab-ce.fullname" . }}
               key: redis-password
         ports:
         - name: ssh
@@ -103,14 +103,14 @@ spec:
       - name: gitlab-etc
       {{- if .Values.persistence.gitlabEtc.enabled }}
         persistentVolumeClaim:
-          claimName: {{ template "fullname" . }}-etc
+          claimName: {{ template "gitlab-ce.fullname" . }}-etc
       {{- else }}
         emptyDir: {}
       {{- end }}
       - name: gitlab-data
       {{- if .Values.persistence.gitlabData.enabled }}
         persistentVolumeClaim:
-          claimName: {{ template "fullname" . }}-data
+          claimName: {{ template "gitlab-ce.fullname" . }}-data
       {{- else }}
         emptyDir: {}
       {{- end }}
diff --git a/stable/gitlab-ce/templates/etc-pvc.yaml b/stable/gitlab-ce/templates/etc-pvc.yaml
index 82376c0f019c..7e2bd8875edb 100644
--- a/stable/gitlab-ce/templates/etc-pvc.yaml
+++ b/stable/gitlab-ce/templates/etc-pvc.yaml
@@ -2,7 +2,7 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ template "fullname" . }}-etc
+  name: {{ template "gitlab-ce.fullname" . }}-etc
   annotations:
   {{- if .Values.persistence.gitlabEtc.storageClass }}
     volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.gitlabEtc.storageClass | quote }}
diff --git a/stable/gitlab-ce/templates/ingress.yaml b/stable/gitlab-ce/templates/ingress.yaml
index a9ce050efd2d..0c35ee9fea57 100644
--- a/stable/gitlab-ce/templates/ingress.yaml
+++ b/stable/gitlab-ce/templates/ingress.yaml
@@ -6,9 +6,9 @@ metadata:
   annotations:
 {{ toYaml .Values.ingress.annotations | indent 4 }}
 {{- end }}
-  name: {{ template "fullname" . }}
+  name: {{ template "gitlab-ce.fullname" . }}
   labels:
-    app: {{ template "fullname" . }}
+    app: {{ template "gitlab-ce.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
@@ -20,14 +20,14 @@ spec:
       paths:
       - path: /
         backend:
-          serviceName: {{ template "fullname" . }}
+          serviceName: {{ template "gitlab-ce.fullname" . }}
           servicePort: {{ .Values.httpsPort }}
     {{- else }}
     http:
       paths:
       - path: /
         backend:
-          serviceName: {{ template "fullname" . }}
+          serviceName: {{ template "gitlab-ce.fullname" . }}
           servicePort: {{ .Values.httpPort }}
     {{- end }}
 
diff --git a/stable/gitlab-ce/templates/secrets.yaml b/stable/gitlab-ce/templates/secrets.yaml
index f76ba8e69c57..d1344e36fca7 100644
--- a/stable/gitlab-ce/templates/secrets.yaml
+++ b/stable/gitlab-ce/templates/secrets.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "gitlab-ce.fullname" . }}
   labels:
-    app: {{ template "fullname" . }}
+    app: {{ template "gitlab-ce.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
diff --git a/stable/gitlab-ce/templates/svc.yaml b/stable/gitlab-ce/templates/svc.yaml
index f60e573969fc..00744bc8b487 100644
--- a/stable/gitlab-ce/templates/svc.yaml
+++ b/stable/gitlab-ce/templates/svc.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "gitlab-ce.fullname" . }}
   labels:
-    app: {{ template "fullname" . }}
+    app: {{ template "gitlab-ce.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
@@ -20,4 +20,4 @@ spec:
     port: {{ .Values.httpsPort | int }}
     targetPort: https
   selector:
-    app: {{ template "fullname" . }}
+    app: {{ template "gitlab-ce.fullname" . }}