diff --git a/charts/podinfo/templates/hpa.yaml b/charts/podinfo/templates/hpa.yaml
index a83d201..6d768ae 100644
--- a/charts/podinfo/templates/hpa.yaml
+++ b/charts/podinfo/templates/hpa.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.hpa.enabled -}}
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ template "podinfo.fullname" . }}
diff --git a/kustomize/hpa.yaml b/kustomize/hpa.yaml
index 6bd46a2..263e912 100644
--- a/kustomize/hpa.yaml
+++ b/kustomize/hpa.yaml
@@ -1,4 +1,4 @@
-apiVersion: autoscaling/v2beta2
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: podinfo
diff --git a/test/deploy.sh b/test/deploy.sh
index 23396b7..75356a4 100755
--- a/test/deploy.sh
+++ b/test/deploy.sh
@@ -24,4 +24,6 @@ helm upgrade --install podinfo ./charts/podinfo \
     --set image.tag=latest \
     --set tls.enabled=true \
     --set certificate.create=true \
+    --set hpa.enabled=true \
+    --set hpa.cpu=95 \
     --namespace=default