diff --git a/incubator/gogs/Chart.yaml b/incubator/gogs/Chart.yaml
index 85f3ca6bc2..076ae5e7c4 100644
--- a/incubator/gogs/Chart.yaml
+++ b/incubator/gogs/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
-description: "Gogs: Go Git Service"
+description: 'Gogs: Go Git Service'
 name: gogs
-version: 0.3.1
+version: 0.4.0
 appVersion: 0.11.29
 home: https://gogs.io/
 icon: https://gogs.io/img/favicon.ico
 keywords:
-  - git
+- git
diff --git a/incubator/gogs/templates/NOTES.txt b/incubator/gogs/templates/NOTES.txt
index 0ec19a509f..44d59b1b30 100644
--- a/incubator/gogs/templates/NOTES.txt
+++ b/incubator/gogs/templates/NOTES.txt
@@ -2,20 +2,20 @@
 
 {{- if contains "NodePort" .Values.serviceType }}
 
-  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "fullname" . }})
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "gogs.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$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 --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}'
+        Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "gogs.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 "gogs.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 "gogs.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/incubator/gogs/templates/_helpers.tpl b/incubator/gogs/templates/_helpers.tpl
index 2bd026d38f..a6c20193f1 100644
--- a/incubator/gogs/templates/_helpers.tpl
+++ b/incubator/gogs/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "name" -}}
+{{- define "gogs.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 "gogs.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 fully qualified server name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
-{{- define "gogs.fullname" -}}
+{{- define "gogs.gogs.fullname" -}}
 {{- printf "%s-%s" .Release.Name "gogs" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -27,7 +27,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 "gogs.postgresql.fullname" -}}
 {{- $name := default "postgresql" .Values.postgresql.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
@@ -35,9 +35,9 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{/*
 Determine database user based on use of postgresql dependency.
 */}}
-{{- define "database.host" -}}
+{{- define "gogs.database.host" -}}
 {{- if .Values.postgresql.install -}}
-{{- template "postgresql.fullname" . -}}
+{{- template "gogs.postgresql.fullname" . -}}
 {{- else -}}
 {{- .Values.service.gogs.databaseHost | quote -}}
 {{- end -}}
@@ -46,7 +46,7 @@ Determine database user based on use of postgresql dependency.
 {{/*
 Determine database user based on use of postgresql dependency.
 */}}
-{{- define "database.user" -}}
+{{- define "gogs.database.user" -}}
 {{- if .Values.postgresql.install -}}
 {{- .Values.postgresql.postgresUser | quote -}}
 {{- else -}}
@@ -57,7 +57,7 @@ Determine database user based on use of postgresql dependency.
 {{/*
 Determine database password based on use of postgresql dependency.
 */}}
-{{- define "database.password" -}}
+{{- define "gogs.database.password" -}}
 {{- if .Values.postgresql.install -}}
 {{- .Values.postgresql.postgresPassword | quote -}}
 {{- else -}}
@@ -68,7 +68,7 @@ Determine database password based on use of postgresql dependency.
 {{/*
 Determine database name based on use of postgresql dependency.
 */}}
-{{- define "database.name" -}}
+{{- define "gogs.database.name" -}}
 {{- if .Values.postgresql.install -}}
 {{- .Values.postgresql.postgresDatabase | quote -}}
 {{- else -}}
diff --git a/incubator/gogs/templates/configmap-tcp.yaml b/incubator/gogs/templates/configmap-tcp.yaml
index 6b011e5715..bcc7f14c8b 100644
--- a/incubator/gogs/templates/configmap-tcp.yaml
+++ b/incubator/gogs/templates/configmap-tcp.yaml
@@ -2,12 +2,12 @@ kind: ConfigMap
 apiVersion: v1
 metadata:
   labels:
-    app: {{ template "fullname" . }}-tcp
+    app: {{ template "gogs.fullname" . }}-tcp
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     component: {{ default "gogs" .Values.service.nameOverride }}
     heritage: "{{ .Release.Service }}"
     release: "{{ .Release.Name }}"
-  name: tcp-{{ template "gogs.fullname" . }}-ssh
+  name: tcp-{{ template "gogs.gogs.fullname" . }}-ssh
 data:
-  2222: default/{{ template "fullname" . }}:ssh
+  2222: default/{{ template "gogs.fullname" . }}:ssh
 
diff --git a/incubator/gogs/templates/configmap.yaml b/incubator/gogs/templates/configmap.yaml
index f86c18999f..3c86613093 100644
--- a/incubator/gogs/templates/configmap.yaml
+++ b/incubator/gogs/templates/configmap.yaml
@@ -2,12 +2,12 @@ kind: ConfigMap
 apiVersion: v1
 metadata:
   labels:
-    app: {{ template "fullname" . }}-config
+    app: {{ template "gogs.fullname" . }}-config
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     component: {{ default "gogs" .Values.service.nameOverride }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-  name: {{ template "gogs.fullname" . }}-config
+  name: {{ template "gogs.gogs.fullname" . }}-config
 data:
   app.ini: |-
     APP_NAME = {{ .Values.service.gogs.appName }}
@@ -38,10 +38,10 @@ data:
 
     [database]
     DB_TYPE = {{ .Values.service.gogs.databaseType | quote }}
-    HOST = {{ template "database.host" . }}
-    NAME = {{ template "database.name" . }}
-    USER = {{ template "database.user" . }}
-    PASSWD = {{ template "database.password" . }}
+    HOST = {{ template "gogs.database.host" . }}
+    NAME = {{ template "gogs.database.name" . }}
+    USER = {{ template "gogs.database.user" . }}
+    PASSWD = {{ template "gogs.database.password" . }}
 
     [security]
     INSTALL_LOCK = true
diff --git a/incubator/gogs/templates/deployment.yaml b/incubator/gogs/templates/deployment.yaml
index 4f344c90d4..d11dac7039 100644
--- a/incubator/gogs/templates/deployment.yaml
+++ b/incubator/gogs/templates/deployment.yaml
@@ -1,7 +1,7 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "gogs.fullname" . }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
 spec:
@@ -10,11 +10,11 @@ spec:
     type: RollingUpdate
   selector:
     matchLabels:
-      app: {{ template "fullname" . }}
+      app: {{ template "gogs.fullname" . }}
   template:
     metadata:
       labels:
-        app: {{ template "fullname" . }}
+        app: {{ template "gogs.fullname" . }}
     spec:
       containers:
         - name: {{ .Chart.Name }}
@@ -46,11 +46,11 @@ spec:
       volumes:
         - name: config
           configMap:
-            name: {{ template "fullname" . }}-config
+            name: {{ template "gogs.fullname" . }}-config
         - name: data
       {{- if .Values.persistence.enabled }}
           persistentVolumeClaim:
-            claimName: {{ template "fullname" . }}
+            claimName: {{ template "gogs.fullname" . }}
       {{- else }}
           emptyDir: {}
       {{- end -}}
diff --git a/incubator/gogs/templates/ingress.yaml b/incubator/gogs/templates/ingress.yaml
index 224dcc59b5..6b4e0f11b9 100644
--- a/incubator/gogs/templates/ingress.yaml
+++ b/incubator/gogs/templates/ingress.yaml
@@ -5,9 +5,9 @@
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: {{ template "gogs.fullname" . }}
+  name: {{ template "gogs.gogs.fullname" . }}
   labels:
-    app: {{ template "gogs.fullname" . }}
+    app: {{ template "gogs.gogs.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
diff --git a/incubator/gogs/templates/pvc.yaml b/incubator/gogs/templates/pvc.yaml
index e185d0473d..458bc40f43 100644
--- a/incubator/gogs/templates/pvc.yaml
+++ b/incubator/gogs/templates/pvc.yaml
@@ -2,9 +2,9 @@
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "gogs.fullname" . }}
   labels:
-    app: {{ template "fullname" . }}
+    app: {{ template "gogs.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
diff --git a/incubator/gogs/templates/secrets.yaml b/incubator/gogs/templates/secrets.yaml
index cfcbbb5ff2..fa6d87d3c3 100644
--- a/incubator/gogs/templates/secrets.yaml
+++ b/incubator/gogs/templates/secrets.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ template "gogs.fullname" . }}
+  name: {{ template "gogs.gogs.fullname" . }}
   labels:
-    app: {{ template "gogs.fullname" . }}
+    app: {{ template "gogs.gogs.fullname" . }}
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
diff --git a/incubator/gogs/templates/service.yaml b/incubator/gogs/templates/service.yaml
index 5a06aa54ba..dc535827b3 100644
--- a/incubator/gogs/templates/service.yaml
+++ b/incubator/gogs/templates/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ template "fullname" . }}
+  name: {{ template "gogs.fullname" . }}
   labels:
     chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
 spec:
@@ -14,4 +14,4 @@ spec:
     targetPort: 2222
     name: {{ default "gogs" .Values.service.nameOverride }}-ssh
   selector:
-    app: {{ template "fullname" . }}
+    app: {{ template "gogs.fullname" . }}