diff --git a/stable/odoo/Chart.yaml b/stable/odoo/Chart.yaml
index 311cfde8c7..38f83eba1f 100644
--- a/stable/odoo/Chart.yaml
+++ b/stable/odoo/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: odoo
-version: 8.1.5
+version: 8.1.6
 appVersion: 12.0.20190615
 description: A suite of web based open source business apps.
 home: https://www.odoo.com/
diff --git a/stable/odoo/README.md b/stable/odoo/README.md
index ebc0e16dce..243c849777 100644
--- a/stable/odoo/README.md
+++ b/stable/odoo/README.md
@@ -56,6 +56,8 @@ The following table lists the configurable parameters of the Odoo chart and thei
 | `image.tag`                           | Odoo Image tag                                            | `{TAG_NAME}`                                            |
 | `image.pullPolicy`                    | Image pull policy                                         | `Always`                                                |
 | `image.pullSecrets`                   | Specify docker-registry secret names as an array          | `[]` (does not add image pull secrets to deployed pods) |
+| `nameOverride`                        | String to partially override odoo.fullname template with a string (will prepend the release name) | `nil`           |
+| `fullnameOverride`                    | String to fully override odoo.fullname template with a string                                     | `nil`           |
 | `odooUsername`                        | User of the application                                   | `user@example.com`                                      |
 | `odooPassword`                        | Admin account password                                    | _random 10 character long alphanumeric string_          |
 | `odooEmail`                           | Admin account email                                       | `user@example.com`                                      |
diff --git a/stable/odoo/templates/_helpers.tpl b/stable/odoo/templates/_helpers.tpl
index fd57f87391..a2b9c2bf5a 100644
--- a/stable/odoo/templates/_helpers.tpl
+++ b/stable/odoo/templates/_helpers.tpl
@@ -11,9 +11,17 @@ 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 "odoo.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 -}}
 
 {{/*
 Create a default fully qualified app name.
diff --git a/stable/odoo/values.yaml b/stable/odoo/values.yaml
index e41ef370b4..e533f03093 100644
--- a/stable/odoo/values.yaml
+++ b/stable/odoo/values.yaml
@@ -26,6 +26,14 @@ image:
   # pullSecrets:
   #   - myRegistryKeySecretName
 
+## String to partially override odoo.fullname template (will maintain the release name)
+##
+# nameOverride:
+
+## String to fully override odoo.fullname template
+##
+# fullnameOverride:
+
 ## User of the application
 ## ref: https://github.com/bitnami/bitnami-docker-odoo#configuration
 ##