diff --git a/charts/descheduler/Chart.yaml b/charts/descheduler/Chart.yaml
index 54e06095b..7fe041849 100644
--- a/charts/descheduler/Chart.yaml
+++ b/charts/descheduler/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 name: descheduler
-version: 0.20.0
-appVersion: 0.20.0
+version: 0.21.0
+appVersion: 0.21.0
 description: Descheduler for Kubernetes is used to rebalance clusters by evicting pods that can potentially be scheduled on better nodes. In the current implementation, descheduler does not schedule replacement of evicted pods but relies on the default scheduler for that.
 keywords:
 - kubernetes
diff --git a/charts/descheduler/README.md b/charts/descheduler/README.md
index befab7a88..7163d5653 100644
--- a/charts/descheduler/README.md
+++ b/charts/descheduler/README.md
@@ -50,6 +50,7 @@ The following table lists the configurable parameters of the _descheduler_ chart
 | `image.pullPolicy`             | Docker image pull policy                                                                                              | `IfNotPresent`                       |
 | `nameOverride`                 | String to partially override `descheduler.fullname` template (will prepend the release name)                          | `""`                                 |
 | `fullnameOverride`             | String to fully override `descheduler.fullname` template                                                              | `""`                                 |
+| `cronJobApiVersion`            | CronJob API Group Version                                                                                             | `"batch/v1"`                         |
 | `schedule`                     | The cron schedule to run the _descheduler_ job on                                                                     | `"*/2 * * * *"`                      |
 | `startingDeadlineSeconds`      | If set, configure `startingDeadlineSeconds` for the _descheduler_ job                                                 | `nil`                                |
 | `successfulJobsHistoryLimit`   | If set, configure `successfulJobsHistoryLimit` for the _descheduler_ job                                              | `nil`                                |
diff --git a/charts/descheduler/templates/cronjob.yaml b/charts/descheduler/templates/cronjob.yaml
index 37df6b2b0..dec7bdcf3 100644
--- a/charts/descheduler/templates/cronjob.yaml
+++ b/charts/descheduler/templates/cronjob.yaml
@@ -1,4 +1,4 @@
-apiVersion: {{ .Values.cronJobApiVersion }}
+apiVersion: {{ .Values.cronJobApiVersion | default "batch/v1" }}
 kind: CronJob
 metadata:
   name: {{ template "descheduler.fullname" . }}
diff --git a/charts/descheduler/values.yaml b/charts/descheduler/values.yaml
index 8de647e0c..d65f24f33 100644
--- a/charts/descheduler/values.yaml
+++ b/charts/descheduler/values.yaml
@@ -19,7 +19,7 @@ resources:
 nameOverride: ""
 fullnameOverride: ""
 
-cronJobApiVersion: "batch/v1"  # for k8s version < 0.21.0, use "batch/v1beta1"
+cronJobApiVersion: "batch/v1"  # Use "batch/v1beta1" for k8s version < 1.21.0. TODO(@7i) remove with 1.23 release
 schedule: "*/2 * * * *"
 #startingDeadlineSeconds: 200
 #successfulJobsHistoryLimit: 1
diff --git a/kind b/kind
new file mode 100755
index 000000000..d3061d925
Binary files /dev/null and b/kind differ
diff --git a/kubernetes/cronjob/cronjob.yaml b/kubernetes/cronjob/cronjob.yaml
index b57b0377d..88d8e9fb8 100644
--- a/kubernetes/cronjob/cronjob.yaml
+++ b/kubernetes/cronjob/cronjob.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: batch/v1  # for k8s version < 0.21.0, use batch/v1beta1
+apiVersion: batch/v1  # for k8s version < 1.21.0, use batch/v1beta1
 kind: CronJob
 metadata:
   name: descheduler-cronjob
diff --git a/test/run-helm-tests.sh b/test/run-helm-tests.sh
index a11dc5d8f..0ed114171 100755
--- a/test/run-helm-tests.sh
+++ b/test/run-helm-tests.sh
@@ -17,12 +17,12 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-K8S_VERSION=${KUBERNETES_VERSION:-v1.20.2}
+K8S_VERSION=${KUBERNETES_VERSION:-v1.21.1}
 IMAGE_REPO=${HELM_IMAGE_REPO:-descheduler}
 IMAGE_TAG=${HELM_IMAGE_TAG:-helm-test}
 CHART_LOCATION=${HELM_CHART_LOCATION:-./charts/descheduler}
 VERSION=helm-test make image
-wget https://github.com/kubernetes-sigs/kind/releases/download/v0.10.0/kind-linux-amd64
+wget https://github.com/kubernetes-sigs/kind/releases/download/v0.11.0/kind-linux-amd64
 chmod +x kind-linux-amd64
 mv kind-linux-amd64 kind
 export PATH=$PATH:$PWD