diff --git a/charts/controller/Chart.yaml b/charts/controller/Chart.yaml
index 22acfe7a..309d870b 100644
--- a/charts/controller/Chart.yaml
+++ b/charts/controller/Chart.yaml
@@ -1,6 +1,8 @@
+apiVersion: v2
 name: controller
 home: https://github.com/teamhephy/controller
-version: <Will be populated by the ci before publishing the chart>
+version: 2.22.3
 description: Hephy Workflow Controller (API).
 maintainers:
-- email: team@teamhephy.com
+- name: Team Hephy
+  email: team@teamhephy.com
diff --git a/charts/controller/templates/controller-clusterrole.yaml b/charts/controller/templates/controller-clusterrole.yaml
index 0f102d58..0145cf2b 100644
--- a/charts/controller/templates/controller-clusterrole.yaml
+++ b/charts/controller/templates/controller-clusterrole.yaml
@@ -50,7 +50,7 @@ rules:
 - apiGroups: ["extensions", "autoscaling"]
   resources: ["horizontalpodautoscalers"]
   verbs: ["get", "list", "create", "update", "delete"]
-{{ if .Values.global.native_ingress }}
+{{ if .Values.global.use_native_ingress }}
 - apiGroups: ["networking.k8s.io"]
   resources: ["ingresses"]
   verbs: ["get", "list", "watch", "create", "update", "delete"]
diff --git a/charts/controller/templates/controller-deployment.yaml b/charts/controller/templates/controller-deployment.yaml
index 0bbd764f..86c1999f 100644
--- a/charts/controller/templates/controller-deployment.yaml
+++ b/charts/controller/templates/controller-deployment.yaml
@@ -60,7 +60,7 @@ spec:
               value: "127.0.0.1"
             # Environmental variable value for $NATIVE_INGRESS
             - name: "NATIVE_INGRESS"
-              value: "{{ .Values.global.native_ingress }}"
+              value: "{{ .Values.global.use_native_ingress }}"
             - name: "NATIVE_INGRESS_HOSTNAME"
               value: "{{ .Values.platform_domain }}"
             - name: "K8S_API_VERIFY_TLS"
diff --git a/charts/controller/templates/controller-ingress-rule-http-80.yaml b/charts/controller/templates/controller-ingress-rule-http-80.yaml
index 48c4b559..27229aa0 100644
--- a/charts/controller/templates/controller-ingress-rule-http-80.yaml
+++ b/charts/controller/templates/controller-ingress-rule-http-80.yaml
@@ -1,4 +1,4 @@
-{{ if .Values.global.native_ingress }}
+{{ if .Values.global.use_native_ingress }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
diff --git a/charts/controller/values.yaml b/charts/controller/values.yaml
index 84d4f574..beab6fee 100644
--- a/charts/controller/values.yaml
+++ b/charts/controller/values.yaml
@@ -1,6 +1,6 @@
-org: "deisci"
-pull_policy: "Always"
-docker_tag: canary
+org: "hephy"
+pull_policy: "IfNotPresent"
+docker_tag: v2.22.0
 app_pull_policy: "Always"
 # A comma-separated list of URLs to send app release information to
 # See https://deis.com/docs/workflow/managing-workflow/deploy-hooks
@@ -71,6 +71,6 @@ global:
   # Valid values are:
   # - true: The deis controller will now create Kubernetes ingress rules for each app, and ingress rules will automatically be created for the controller itself.
   # - false: The default mode, and the default behavior of Deis workflow.
-  native_ingress: false
+  use_native_ingress: false
   # Role-Based Access Control for Kubernetes >= 1.5
   use_rbac: false