diff --git a/stable/nats/Chart.yaml b/stable/nats/Chart.yaml
index 77c0833abf..18f715de4c 100644
--- a/stable/nats/Chart.yaml
+++ b/stable/nats/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: nats
-version: 3.0.3
+version: 3.0.4
 appVersion: 2.0.2
 description: An open-source, cloud-native messaging system
 keywords:
diff --git a/stable/nats/README.md b/stable/nats/README.md
index 31d4097f95..e2b253f138 100644
--- a/stable/nats/README.md
+++ b/stable/nats/README.md
@@ -54,8 +54,6 @@ The following table lists the configurable parameters of the NATS chart and thei
 | `image.tag`                          | NATS Image tag                                                                               | `{TAG_NAME}`                                                  |
 | `image.pullPolicy`                   | Image pull policy                                                                            | `IfNotPresent`                                                |
 | `image.pullSecrets`                  | Specify docker-registry secret names as an array                                             | `[]` (does not add image pull secrets to deployed pods)       |
-| `nameOverride`                       | String to partially override nats.fullname template with a string (will prepend the release name) | `nil`                                                    |
-| `fullnameOverride`                   | String to fully override nats.fullname template with a string                                | `nil`                                                         |
 | `auth.enabled`                       | Switch to enable/disable client authentication                                               | `true`                                                        |
 | `auth.user`                          | Client authentication user                                                                   | `nats_cluster`                                                |
 | `auth.password`                      | Client authentication password                                                               | `random alhpanumeric string (10)`                             |
diff --git a/stable/nats/templates/_helpers.tpl b/stable/nats/templates/_helpers.tpl
index b52eed8473..6159ca0959 100644
--- a/stable/nats/templates/_helpers.tpl
+++ b/stable/nats/templates/_helpers.tpl
@@ -12,17 +12,9 @@ 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 "nats.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
-{{- end -}}
-{{- end -}}
 
 {{- define "nats.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
diff --git a/stable/nats/values-production.yaml b/stable/nats/values-production.yaml
index 0d3c812ac6..ed41dd43d8 100644
--- a/stable/nats/values-production.yaml
+++ b/stable/nats/values-production.yaml
@@ -26,14 +26,6 @@ image:
   # pullSecrets:
   #   - name: myRegistryKeySecretName
 
-## String to partially override nats.fullname template (will maintain the release name)
-##
-# nameOverride:
-
-## String to fully override nats.fullname template
-##
-# fullnameOverride:
-
 ## NATS replicas
 replicaCount: 3
 
diff --git a/stable/nats/values.yaml b/stable/nats/values.yaml
index e9c3f6a868..5bbc26a905 100644
--- a/stable/nats/values.yaml
+++ b/stable/nats/values.yaml
@@ -26,14 +26,6 @@ image:
   # pullSecrets:
   #   - name: myRegistryKeySecretName
 
-## String to partially override nats.fullname template (will maintain the release name)
-##
-# nameOverride:
-
-## String to fully override nats.fullname template
-##
-# fullnameOverride:
-
 ## NATS replicas
 replicaCount: 1