diff --git a/build/package/helm/commandhandler/templates/hpa.yaml b/build/package/helm/commandhandler/templates/hpa.yaml
index 4c8e2818f..1ea68650e 100644
--- a/build/package/helm/commandhandler/templates/hpa.yaml
+++ b/build/package/helm/commandhandler/templates/hpa.yaml
@@ -1,5 +1,9 @@
-{{- if .Values.autoscaling.enabled }}
+{{- if .Values.autoscaling.enabled -}}
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
+apiVersion: autoscaling/v2
+{{- else }}
 apiVersion: autoscaling/v2beta1
+{{- end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "commandhandler.fullname" . }}
diff --git a/build/package/helm/eventstore/templates/cronjob-backup.yaml b/build/package/helm/eventstore/templates/cronjob-backup.yaml
index c88136698..ddd4da20f 100644
--- a/build/package/helm/eventstore/templates/cronjob-backup.yaml
+++ b/build/package/helm/eventstore/templates/cronjob-backup.yaml
@@ -1,6 +1,10 @@
 {{- $merged := merge (deepCopy .Values) (deepCopy (default (dict) .Values.global)) -}}
-{{- if .Values.backup.enabled }}
+{{- if .Values.backup.enabled -}}
+{{- if .Capabilities.APIVersions.Has "batch/v1/CronJob" }}
+apiVersion: batch/v1
+{{- else }}
 apiVersion: batch/v1beta1
+{{- end }}
 kind: CronJob
 metadata:
   name: {{ include "eventstore.fullname" . }}-backup
diff --git a/build/package/helm/eventstore/templates/hpa.yaml b/build/package/helm/eventstore/templates/hpa.yaml
index 642748de8..0856422ee 100644
--- a/build/package/helm/eventstore/templates/hpa.yaml
+++ b/build/package/helm/eventstore/templates/hpa.yaml
@@ -1,5 +1,9 @@
-{{- if .Values.autoscaling.enabled }}
+{{- if .Values.autoscaling.enabled -}}
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
+apiVersion: autoscaling/v2
+{{- else }}
 apiVersion: autoscaling/v2beta1
+{{- end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "eventstore.fullname" . }}
diff --git a/build/package/helm/gateway/templates/hpa.yaml b/build/package/helm/gateway/templates/hpa.yaml
index 3ed01ea31..ba2f2733d 100644
--- a/build/package/helm/gateway/templates/hpa.yaml
+++ b/build/package/helm/gateway/templates/hpa.yaml
@@ -1,5 +1,9 @@
-{{- if .Values.autoscaling.enabled }}
+{{- if .Values.autoscaling.enabled -}}
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
+apiVersion: autoscaling/v2
+{{- else }}
 apiVersion: autoscaling/v2beta1
+{{- end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "gateway.fullname" . }}
diff --git a/build/package/helm/monoskope/Chart.yaml b/build/package/helm/monoskope/Chart.yaml
index 56f1e2985..2c9d0eff0 100644
--- a/build/package/helm/monoskope/Chart.yaml
+++ b/build/package/helm/monoskope/Chart.yaml
@@ -44,7 +44,7 @@ dependencies: # A list of the chart requirements
     repository: "file://../scimserver"
     condition: scimserver.enabled,global.scimserver.enabled
   - name: cockroachdb
-    version: 7.0.1
+    version: 9.1.0
     repository: https://charts.cockroachdb.com/
     condition: cockroachdb.enabled,global.cockroachdb.enabled
   - name: rabbitmq
diff --git a/build/package/helm/queryhandler/templates/hpa.yaml b/build/package/helm/queryhandler/templates/hpa.yaml
index e8f96f494..f4f0c64cc 100644
--- a/build/package/helm/queryhandler/templates/hpa.yaml
+++ b/build/package/helm/queryhandler/templates/hpa.yaml
@@ -1,5 +1,9 @@
-{{- if .Values.autoscaling.enabled }}
+{{- if .Values.autoscaling.enabled -}}
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
+apiVersion: autoscaling/v2
+{{- else }}
 apiVersion: autoscaling/v2beta1
+{{- end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "queryhandler.fullname" . }}
diff --git a/build/package/helm/scimserver/templates/hpa.yaml b/build/package/helm/scimserver/templates/hpa.yaml
index 77c8c00b2..d19eca4cf 100644
--- a/build/package/helm/scimserver/templates/hpa.yaml
+++ b/build/package/helm/scimserver/templates/hpa.yaml
@@ -1,5 +1,9 @@
-{{- if .Values.autoscaling.enabled }}
+{{- if .Values.autoscaling.enabled -}}
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2/HorizontalPodAutoscaler" }}
+apiVersion: autoscaling/v2
+{{- else }}
 apiVersion: autoscaling/v2beta1
+{{- end }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "scimserver.fullname" . }}