diff --git a/nowchess/base/nowchess-rollouts.yaml b/nowchess/base/nowchess-rollouts.yaml
index 9b70c4e..29a075d 100644
--- a/nowchess/base/nowchess-rollouts.yaml
+++ b/nowchess/base/nowchess-rollouts.yaml
@@ -5,7 +5,6 @@ metadata:
   labels:
     app: nowchess-account
 spec:
-  replicas: 1
   selector:
     matchLabels:
       app: nowchess-account
@@ -97,7 +96,6 @@ metadata:
   labels:
     app: nowchess-bot-platform
 spec:
-  replicas: 1
   selector:
     matchLabels:
       app: nowchess-bot-platform
@@ -155,7 +153,6 @@ metadata:
   labels:
     app: nowchess-coordinator
 spec:
-  replicas: 1
   selector:
     matchLabels:
       app: nowchess-coordinator
@@ -313,7 +310,6 @@ metadata:
   labels:
     app: nowchess-io
 spec:
-  replicas: 1
   selector:
     matchLabels:
       app: nowchess-io
@@ -372,7 +368,6 @@ metadata:
   labels:
     app: nowchess-official-bots
 spec:
-  replicas: 1
   selector:
     matchLabels:
       app: nowchess-official-bots
@@ -430,7 +425,6 @@ metadata:
   labels:
     app: nowchess-rule
 spec:
-  replicas: 1
   selector:
     matchLabels:
       app: nowchess-rule
@@ -489,7 +483,6 @@ metadata:
   labels:
     app: nowchess-store
 spec:
-  replicas: 1
   selector:
     matchLabels:
       app: nowchess-store
@@ -567,7 +560,6 @@ metadata:
   labels:
     app: nowchess-ws
 spec:
-  replicas: 1
   selector:
     matchLabels:
       app: nowchess-ws
diff --git a/nowchess/eu-central-1-staging/kustomization.yaml b/nowchess/eu-central-1-staging/kustomization.yaml
index 3ccc611..e4e6ab2 100644
--- a/nowchess/eu-central-1-staging/kustomization.yaml
+++ b/nowchess/eu-central-1-staging/kustomization.yaml
@@ -20,26 +20,26 @@ patches:
     kind: ConfigMap
     name: nowchess-env-config
 - patch: |-
-    apiVersion: argoproj.io/v1alpha1
-    kind: Rollout
+    apiVersion: autoscaling/v2
+    kind: HorizontalPodAutoscaler
     metadata:
       name: nowchess-account
     spec:
-      replicas: 1
+      minReplicas: 1
 - patch: |-
-    apiVersion: argoproj.io/v1alpha1
-    kind: Rollout
+    apiVersion: autoscaling/v2
+    kind: HorizontalPodAutoscaler
     metadata:
       name: nowchess-core
     spec:
-      replicas: 1
+      minReplicas: 1
 - patch: |-
-    apiVersion: argoproj.io/v1alpha1
-    kind: Rollout
+    apiVersion: autoscaling/v2
+    kind: HorizontalPodAutoscaler
     metadata:
       name: nowchess-ws
     spec:
-      replicas: 1
+      minReplicas: 1
 images:
 - name: ghcr.io/now-chess/now-chess-systems/account
   newTag: 0.4.0
diff --git a/postgres-tunnel/eu-central-1/deployment.yaml b/postgres-tunnel/eu-central-1/deployment.yaml
index 0735c03..7cdf0dc 100644
--- a/postgres-tunnel/eu-central-1/deployment.yaml
+++ b/postgres-tunnel/eu-central-1/deployment.yaml
@@ -4,7 +4,6 @@ metadata:
   name: postgres-tunnel
   namespace: postgres-tunnel
 spec:
-  replicas: 1
   selector:
     matchLabels:
       app: postgres-tunnel