diff --git a/charts/azp-agent/Chart.yaml b/charts/azp-agent/Chart.yaml
index 726127b..90a8d5f 100644
--- a/charts/azp-agent/Chart.yaml
+++ b/charts/azp-agent/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart for Azure Pipeline Agents
 name: azp-agent
-version: 1.4.5
+version: 1.4.6
 urls:
 - https://github.com/ggmaresca/azp-agent
 - https://github.com/ggmaresca/azp-agent-autoscaler
diff --git a/charts/azp-agent/templates/autoscaler-poddisruptionbudget.yaml b/charts/azp-agent/templates/autoscaler-poddisruptionbudget.yaml
index 2833527..23ac148 100644
--- a/charts/azp-agent/templates/autoscaler-poddisruptionbudget.yaml
+++ b/charts/azp-agent/templates/autoscaler-poddisruptionbudget.yaml
@@ -1,5 +1,5 @@
 {{- if and .Values.scaling.enabled (empty .Values.scaling.cpu) .Values.scaling.pdb.enabled }}
-apiVersion: policy/v1beta1
+apiVersion: policy/v1{{ if semverCompare "<1.21.0" .Capabilities.KubeVersion.Version }}beta1{{ end }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "azp-agent.autoscaler.fullname" . }}
diff --git a/charts/azp-agent/templates/autoscaler-podsecuritypolicy.yaml b/charts/azp-agent/templates/autoscaler-podsecuritypolicy.yaml
index e14543c..b163d53 100644
--- a/charts/azp-agent/templates/autoscaler-podsecuritypolicy.yaml
+++ b/charts/azp-agent/templates/autoscaler-podsecuritypolicy.yaml
@@ -1,5 +1,5 @@
 {{- if and .Values.scaling.enabled (empty .Values.scaling.cpu) .Values.scaling.rbac.psp.enabled }}
-apiVersion: policy/v1beta1
+apiVersion: policy/v1{{ if semverCompare "<1.21.0" .Capabilities.KubeVersion.Version }}beta1{{ end }}
 kind: PodSecurityPolicy
 metadata:
   name: {{ include "azp-agent.autoscaler.psp.name" . }}