diff --git a/upstreamed/dokuwiki/Chart.yaml b/upstreamed/dokuwiki/Chart.yaml
index 7b790f560..f16c45199 100644
--- a/upstreamed/dokuwiki/Chart.yaml
+++ b/upstreamed/dokuwiki/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: dokuwiki
-version: 5.2.12
+version: 6.0.0
 appVersion: 0.20180422.201901061035
 description: DokuWiki is a standards-compliant, simple to use wiki optimized for creating
   documentation. It is targeted at developer teams, workgroups, and small companies.
diff --git a/upstreamed/dokuwiki/README.md b/upstreamed/dokuwiki/README.md
index 61b19c140..a8ab7e74f 100644
--- a/upstreamed/dokuwiki/README.md
+++ b/upstreamed/dokuwiki/README.md
@@ -149,6 +149,14 @@ See the [Parameters](#parameters) section to configure the PVC or to disable per
 
 ## Upgrading
 
+### To 6.0.0
+
+Helm performs a lookup for the object based on its group (apps), version (v1), and kind (Deployment). Also known as its GroupVersionKind, or GVK. Changing the GVK is considered a compatibility breaker from Kubernetes' point of view, so you cannot "upgrade" those objects to the new GVK in-place. Earlier versions of Helm 3 did not perform the lookup correctly which has since been fixed to match the spec.
+
+In https://github.com/helm/charts/pull/17294 the `apiVersion` of the deployment resources was updated to `apps/v1` in tune with the api's deprecated, resulting in compatibility breakage.
+
+This major version signifies this change.
+
 ### To 3.0.0
 
 Backwards compatibility is not guaranteed unless you modify the labels used on the chart's deployments.
diff --git a/upstreamed/dokuwiki/templates/_helpers.tpl b/upstreamed/dokuwiki/templates/_helpers.tpl
index 06b12a4b0..f2e0780a8 100644
--- a/upstreamed/dokuwiki/templates/_helpers.tpl
+++ b/upstreamed/dokuwiki/templates/_helpers.tpl
@@ -145,3 +145,14 @@ but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else
     {{- end -}}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Return the appropriate apiVersion for deployment.
+*/}}
+{{- define "dokuwiki.deployment.apiVersion" -}}
+{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- print "extensions/v1beta1" -}}
+{{- else -}}
+{{- print "apps/v1" -}}
+{{- end -}}
+{{- end -}}
diff --git a/upstreamed/dokuwiki/templates/deployment.yaml b/upstreamed/dokuwiki/templates/deployment.yaml
index 196b92a05..6c9affd80 100644
--- a/upstreamed/dokuwiki/templates/deployment.yaml
+++ b/upstreamed/dokuwiki/templates/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1
+apiVersion: {{ template "dokuwiki.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
   name: {{ template "dokuwiki.fullname" . }}
diff --git a/upstreamed/kubewatch/Chart.yaml b/upstreamed/kubewatch/Chart.yaml
index 2b65bd0a4..48bc21861 100644
--- a/upstreamed/kubewatch/Chart.yaml
+++ b/upstreamed/kubewatch/Chart.yaml
@@ -1,5 +1,5 @@
 name: kubewatch
-version: 0.8.13
+version: 1.0.0
 apiVersion: v1
 appVersion: 0.0.4
 home: https://github.com/bitnami-labs/kubewatch
diff --git a/upstreamed/kubewatch/README.md b/upstreamed/kubewatch/README.md
index 40560eac9..0e00adcf1 100644
--- a/upstreamed/kubewatch/README.md
+++ b/upstreamed/kubewatch/README.md
@@ -117,3 +117,13 @@ Open [https://my.slack.com/services/new/bot](https://my.slack.com/services/new/b
 The API token can be found on the edit page (it starts with `xoxb-`).
 
 Invite the Bot to your channel by typing `/join @name_of_your_bot` in the Slack message area.
+
+## Upgrading
+
+### To 1.0.0
+
+Helm performs a lookup for the object based on its group (apps), version (v1), and kind (Deployment). Also known as its GroupVersionKind, or GVK. Changing the GVK is considered a compatibility breaker from Kubernetes' point of view, so you cannot "upgrade" those objects to the new GVK in-place. Earlier versions of Helm 3 did not perform the lookup correctly which has since been fixed to match the spec.
+
+In https://github.com/helm/charts/pull/17285 the `apiVersion` of the deployment resources was updated to `apps/v1` in tune with the api's deprecated, resulting in compatibility breakage.
+
+This major version signifies this change.
diff --git a/upstreamed/kubewatch/templates/_helpers.tpl b/upstreamed/kubewatch/templates/_helpers.tpl
index 357b50b84..9653f5abd 100644
--- a/upstreamed/kubewatch/templates/_helpers.tpl
+++ b/upstreamed/kubewatch/templates/_helpers.tpl
@@ -93,3 +93,14 @@ imagePullSecrets:
 {{- end }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Return the appropriate apiVersion for deployment.
+*/}}
+{{- define "kubewatch.deployment.apiVersion" -}}
+{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- print "apps/v1beta2" -}}
+{{- else -}}
+{{- print "apps/v1" -}}
+{{- end -}}
+{{- end -}}
diff --git a/upstreamed/kubewatch/templates/deployment.yaml b/upstreamed/kubewatch/templates/deployment.yaml
index 91c53cb6a..5f85cb80e 100644
--- a/upstreamed/kubewatch/templates/deployment.yaml
+++ b/upstreamed/kubewatch/templates/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: apps/v1
+apiVersion: {{ template "kubewatch.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
   labels:
diff --git a/upstreamed/orangehrm/Chart.yaml b/upstreamed/orangehrm/Chart.yaml
index 2ccd19e29..28b7004c6 100644
--- a/upstreamed/orangehrm/Chart.yaml
+++ b/upstreamed/orangehrm/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: orangehrm
-version: 6.2.8
+version: 7.0.0
 appVersion: 4.3.3-0
 description: OrangeHRM is a free HR management system that offers a wealth of modules
   to suit the needs of your business.
diff --git a/upstreamed/orangehrm/README.md b/upstreamed/orangehrm/README.md
index 8d0d05508..c92989a2e 100644
--- a/upstreamed/orangehrm/README.md
+++ b/upstreamed/orangehrm/README.md
@@ -154,6 +154,14 @@ See the [Parameters](#parameters) section to configure the PVC or to disable per
 
 ## Upgrading
 
+### To 7.0.0
+
+Helm performs a lookup for the object based on its group (apps), version (v1), and kind (Deployment). Also known as its GroupVersionKind, or GVK. Changing the GVK is considered a compatibility breaker from Kubernetes' point of view, so you cannot "upgrade" those objects to the new GVK in-place. Earlier versions of Helm 3 did not perform the lookup correctly which has since been fixed to match the spec.
+
+In this version the `apiVersion` of the deployment resources is updated to `apps/v1` in tune with the api's deprecated, resulting in compatibility breakage.
+
+This major version signifies this change.
+
 ### To 3.0.0
 
 Backwards compatibility is not guaranteed unless you modify the labels used on the chart's deployments.
diff --git a/upstreamed/orangehrm/requirements.lock b/upstreamed/orangehrm/requirements.lock
index 5b5ef8873..fe5c155c0 100644
--- a/upstreamed/orangehrm/requirements.lock
+++ b/upstreamed/orangehrm/requirements.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: mariadb
   repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 6.12.2
-digest: sha256:a363428d6463718a9523a88c70e485218373e315f2979cb1bb17b034ec2be96a
-generated: 2019-10-29T22:35:21.86486001Z
+  version: 7.0.0
+digest: sha256:cd64413a4a697ccf85c0091e9c55cdc5876938ddced84c05d37c57ff9abc5864
+generated: "2019-11-09T11:38:02.512650528+05:30"
diff --git a/upstreamed/orangehrm/requirements.yaml b/upstreamed/orangehrm/requirements.yaml
index 127c01935..389c9f3cb 100644
--- a/upstreamed/orangehrm/requirements.yaml
+++ b/upstreamed/orangehrm/requirements.yaml
@@ -1,5 +1,5 @@
 dependencies:
 - name: mariadb
-  version: 6.x.x
+  version: 7.x.x
   repository: https://kubernetes-charts.storage.googleapis.com/
   condition: mariadb.enabled
diff --git a/upstreamed/orangehrm/templates/_helpers.tpl b/upstreamed/orangehrm/templates/_helpers.tpl
index 8a0098916..59ee13f28 100644
--- a/upstreamed/orangehrm/templates/_helpers.tpl
+++ b/upstreamed/orangehrm/templates/_helpers.tpl
@@ -153,3 +153,14 @@ but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else
     {{- end -}}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Return the appropriate apiVersion for deployment.
+*/}}
+{{- define "orangehrm.deployment.apiVersion" -}}
+{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- print "extensions/v1beta1" -}}
+{{- else -}}
+{{- print "apps/v1" -}}
+{{- end -}}
+{{- end -}}
diff --git a/upstreamed/orangehrm/templates/deployment.yaml b/upstreamed/orangehrm/templates/deployment.yaml
index 6bfee5178..7c7aa3dc6 100644
--- a/upstreamed/orangehrm/templates/deployment.yaml
+++ b/upstreamed/orangehrm/templates/deployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: {{ template "orangehrm.deployment.apiVersion" . }}
 kind: Deployment
 metadata:
   name: {{ template "orangehrm.fullname" . }}
@@ -143,4 +143,4 @@ spec:
       {{- with .Values.affinity }}
       affinity:
 {{ toYaml . | indent 8 }}
-      {{- end }}
\ No newline at end of file
+      {{- end }}
diff --git a/upstreamed/redis/Chart.yaml b/upstreamed/redis/Chart.yaml
index 2203e38a3..ede15bb97 100644
--- a/upstreamed/redis/Chart.yaml
+++ b/upstreamed/redis/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: redis
-version: 9.5.2
-appVersion: 5.0.5
+version: 9.5.3
+appVersion: 5.0.6
 description: Open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets.
 keywords:
 - redis
diff --git a/upstreamed/redis/values-production.yaml b/upstreamed/redis/values-production.yaml
index 2c147a6b8..88565ac08 100644
--- a/upstreamed/redis/values-production.yaml
+++ b/upstreamed/redis/values-production.yaml
@@ -17,7 +17,7 @@ image:
   ## Bitnami Redis image tag
   ## ref: https://github.com/bitnami/bitnami-docker-redis#supported-tags-and-respective-dockerfile-links
   ##
-  tag: 5.0.5-debian-9-r181
+  tag: 5.0.6-debian-9-r1
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -56,7 +56,7 @@ sentinel:
     ## Bitnami Redis image tag
     ## ref: https://github.com/bitnami/bitnami-docker-redis-sentinel#supported-tags-and-respective-dockerfile-links
     ##
-    tag: 5.0.5-debian-9-r174
+    tag: 5.0.6-debian-9-r0
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
     ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -458,7 +458,7 @@ metrics:
   image:
     registry: docker.io
     repository: bitnami/redis-exporter
-    tag: 1.3.2-debian-9-r0
+    tag: 1.3.2-debian-9-r4
     pullPolicy: IfNotPresent
     ## Optionally specify an array of imagePullSecrets.
     ## Secrets must be manually created in the namespace.
diff --git a/upstreamed/redis/values.yaml b/upstreamed/redis/values.yaml
index e589aa492..457b53bae 100644
--- a/upstreamed/redis/values.yaml
+++ b/upstreamed/redis/values.yaml
@@ -17,7 +17,7 @@ image:
   ## Bitnami Redis image tag
   ## ref: https://github.com/bitnami/bitnami-docker-redis#supported-tags-and-respective-dockerfile-links
   ##
-  tag: 5.0.5-debian-9-r181
+  tag: 5.0.6-debian-9-r1
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -56,7 +56,7 @@ sentinel:
     ## Bitnami Redis image tag
     ## ref: https://github.com/bitnami/bitnami-docker-redis-sentinel#supported-tags-and-respective-dockerfile-links
     ##
-    tag: 5.0.5-debian-9-r174
+    tag: 5.0.6-debian-9-r0
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
     ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -458,7 +458,7 @@ metrics:
   image:
     registry: docker.io
     repository: bitnami/redis-exporter
-    tag: 1.3.2-debian-9-r0
+    tag: 1.3.2-debian-9-r4
     pullPolicy: IfNotPresent
     ## Optionally specify an array of imagePullSecrets.
     ## Secrets must be manually created in the namespace.