diff --git a/stable/odoo/Chart.yaml b/stable/odoo/Chart.yaml
index 3e8bfab2b8..a052129d4d 100644
--- a/stable/odoo/Chart.yaml
+++ b/stable/odoo/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: odoo
-version: 10.1.3
+version: 11.0.0
 appVersion: 12.0.20190815
 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 02914a5658..451b90cb3b 100644
--- a/stable/odoo/README.md
+++ b/stable/odoo/README.md
@@ -78,12 +78,12 @@ The following table lists the configurable parameters of the Odoo chart and thei
 | `externalDatabase.database`           | Name of the existing database                             | `bitnami_odoo`                                          |
 | `externalDatabase.port`               | Database port number                                      | `5432`                                                  |
 | `ingress.enabled`                     | Enable ingress controller resource                        | `false`                                                 |
+| `ingress.certManager`                 | Add annotations for cert-manager                          | `false`                                                 |
+| `ingress.annotations`                 | Annotations for the ingress                               | `[]`                                                    |
 | `ingress.hosts[0].name`               | Hostname to your Odoo installation                        | `odoo.local`                                            |
 | `ingress.hosts[0].path`               | Path within the url structure                             | `/`                                                     |
 | `ingress.hosts[0].tls`                | Utilize TLS backend in ingress                            | `false`                                                 |
-| `ingress.hosts[0].certManager`        | Add annotations for cert-manager                          | `false`                                                 |
 | `ingress.hosts[0].tlsSecret`          | TLS Secret (certificates)                                 | `odoo.local-tls-secret`                                 |
-| `ingress.hosts[0].annotations`        | Annotations for this host's ingress record                | `[]`                                                    |
 | `ingress.secrets[0].name`             | TLS Secret Name                                           | `nil`                                                   |
 | `ingress.secrets[0].certificate`      | TLS Secret Certificate                                    | `nil`                                                   |
 | `ingress.secrets[0].key`              | TLS Secret Key                                            | `nil`                                                   |
diff --git a/stable/odoo/templates/ingress.yaml b/stable/odoo/templates/ingress.yaml
index 13cecc638a..54ff05e38f 100644
--- a/stable/odoo/templates/ingress.yaml
+++ b/stable/odoo/templates/ingress.yaml
@@ -2,17 +2,17 @@
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: {{ template "odoo.fullname" $ }}
+  name: {{ template "odoo.fullname" . }}
   labels:
-    app: {{ template "odoo.name" $ }}
-    chart: {{ template "odoo.chart" $ }}
-    release: {{ $.Release.Name | quote }}
-    heritage: {{ $.Release.Service | quote }}
+    app: {{ template "odoo.name" . }}
+    chart: {{ template "odoo.chart" . }}
+    release: {{ .Release.Name | quote }}
+    heritage: {{ .Release.Service | quote }}
   annotations:
-    {{- if .certManager }}
+    {{- if .Values.ingress.certManager }}
     kubernetes.io/tls-acme: "true"
     {{- end }}
-    {{- range $key, $value := .annotations }}
+    {{- range $key, $value := .Values.ingress.annotations }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
 spec:
diff --git a/stable/odoo/values.yaml b/stable/odoo/values.yaml
index e0ce0ebf19..26ae5fc580 100644
--- a/stable/odoo/values.yaml
+++ b/stable/odoo/values.yaml
@@ -150,21 +150,20 @@ ingress:
     ## A side effect of this will be that the backend odoo service will be connected at port 443
     tls: false
 
-    ## Set this to true in order to add the corresponding annotations for cert-manager
-    certManager: false
-
     ## If TLS is set to true, you must declare what secret will store the key/certificate for TLS
     tlsSecret: odoo.local-tls
 
-    ## Ingress annotations done as key:value pairs
-    ## For a full list of possible ingress annotations, please see
-    ## ref: https://github.com/kubernetes/ingress-nginx/blob/master/docs/annotations.md
-    ##
-    ## If tls is set to true, annotation ingress.kubernetes.io/secure-backends: "true" will automatically be set
-    ## If certManager is set to true, annotation kubernetes.io/tls-acme: "true" will automatically be set
-    annotations:
-    #  kubernetes.io/ingress.class: nginx
-    #  kubernetes.io/tls-acme: true
+  ## Set this to true in order to add the corresponding annotations for cert-manager
+  certManager: false
+  ## Ingress annotations done as key:value pairs
+  ## For a full list of possible ingress annotations, please see
+  ## ref: https://github.com/kubernetes/ingress-nginx/blob/master/docs/annotations.md
+  ##
+  ## If tls is set to true, annotation ingress.kubernetes.io/secure-backends: "true" will automatically be set
+  ## If certManager is set to true, annotation kubernetes.io/tls-acme: "true" will automatically be set
+  annotations:
+  #  kubernetes.io/ingress.class: nginx
+  #  kubernetes.io/tls-acme: true
 
   secrets:
   ## If you're providing your own certificates, please use this to add the certificates as secrets