diff --git a/charts/drupal/templates/cronjob/cron.yaml b/charts/drupal/templates/cronjob/cron.yaml
index c5d37c20..362b0243 100644
--- a/charts/drupal/templates/cronjob/cron.yaml
+++ b/charts/drupal/templates/cronjob/cron.yaml
@@ -8,7 +8,7 @@
 {{- $ctx := . }}
 {{- range $cronName, $cron := .Values.drupal.additionalCrons }}
 ---
-{{- if semverCompare ">=1.21" $.Capabilities.KubeVersion.GitVersion }}
+{{- if semverCompare ">=1.21-0" $.Capabilities.KubeVersion.GitVersion }}
 apiVersion: batch/v1
 {{- else }}
 apiVersion: batch/v1beta1
diff --git a/charts/drupal/templates/cronjob/drupal-backup.yaml b/charts/drupal/templates/cronjob/drupal-backup.yaml
index bf2ebb2d..257ab764 100644
--- a/charts/drupal/templates/cronjob/drupal-backup.yaml
+++ b/charts/drupal/templates/cronjob/drupal-backup.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.drupal.backup.enabled }}
-{{- if semverCompare ">=1.21" $.Capabilities.KubeVersion.GitVersion }}
+{{- if semverCompare ">=1.21-0" $.Capabilities.KubeVersion.GitVersion }}
 apiVersion: batch/v1
 {{- else }}
 apiVersion: batch/v1beta1
diff --git a/charts/drupal/templates/cronjob/drupal.yaml b/charts/drupal/templates/cronjob/drupal.yaml
index 717cba73..c32bb7f4 100644
--- a/charts/drupal/templates/cronjob/drupal.yaml
+++ b/charts/drupal/templates/cronjob/drupal.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.drupal.cron.enabled }}
-{{- if semverCompare ">=1.21" $.Capabilities.KubeVersion.GitVersion }}
+{{- if semverCompare ">=1.21-0" $.Capabilities.KubeVersion.GitVersion }}
 apiVersion: batch/v1
 {{- else }}
 apiVersion: batch/v1beta1
diff --git a/charts/drupal/templates/pdb/poddisruptionbudget.yaml b/charts/drupal/templates/pdb/poddisruptionbudget.yaml
index 0cd8be24..a04dddec 100644
--- a/charts/drupal/templates/pdb/poddisruptionbudget.yaml
+++ b/charts/drupal/templates/pdb/poddisruptionbudget.yaml
@@ -5,7 +5,7 @@
 {{- $release := .Release }}
 {{- $values := .Values }}
 ---
-{{- if semverCompare ">=1.21" $.Capabilities.KubeVersion.GitVersion }}
+{{- if semverCompare ">=1.21-0" $.Capabilities.KubeVersion.GitVersion }}
 apiVersion: policy/v1
 {{- else }}
 apiVersion: policy/v1beta1