diff --git a/charts/gitops-runtime/README.md b/charts/gitops-runtime/README.md
index 8d944b9c..24120fa2 100644
--- a/charts/gitops-runtime/README.md
+++ b/charts/gitops-runtime/README.md
@@ -90,6 +90,7 @@ sealed-secrets:
 | app-proxy.config.env | string | `"production"` |  |
 | app-proxy.config.logLevel | string | `"info"` | Log Level |
 | app-proxy.config.skipGitPermissionValidation | string | `"false"` | Skit git permissions validation |
+| app-proxy.config.clusterChunkSize | int | `0` | Number of clusters per request. App-proxy will split and refresh the cluster list with chunks with size `clusterChunkSize`. When the default value is used the cluster list will be refreshed with one chunk (no split; not recommended when cluster list is too large). |
 | app-proxy.env | object | `{}` |  |
 | app-proxy.extraVolumeMounts | list | `[]` | Extra volume mounts for main container |
 | app-proxy.extraVolumes | list | `[]` | extra volumes |
diff --git a/charts/gitops-runtime/templates/_components/cap-app-proxy/_config.yaml b/charts/gitops-runtime/templates/_components/cap-app-proxy/_config.yaml
index 8485c411..9beeca42 100644
--- a/charts/gitops-runtime/templates/_components/cap-app-proxy/_config.yaml
+++ b/charts/gitops-runtime/templates/_components/cap-app-proxy/_config.yaml
@@ -4,6 +4,9 @@ argoCdUsername: {{ .Values.config.argoCdUsername }}
 argoWorkflowsInsecure: {{ .Values.config.argoWorkflowsInsecure | quote }}
 argoWorkflowsUrl: {{ default "" .Values.config.argoWorkflowsUrl }}
 cors: {{ .Values.global.codefresh.url }}
+  {{- with .Values.config.clusterChunkSize }} 
+clusterChunkSize: {{ . | quote }}
+  {{- end }}
 env: {{ .Values.config.env | quote}}
 isConfigurationRuntime: {{ .Values.global.runtime.isConfigurationRuntime | quote }} 
 runtimeName: {{ required "global.runtime.name is required" .Values.global.runtime.name | quote}}
@@ -26,7 +29,7 @@ enrichmentJiraEnrichmentImage: {{ printf "%s/%s:%s" $enrichmentValues.config.ima
 
 {{- define "cap-app-proxy.resources.configmap" }}
 {{- $documentedConfigs := (include "cap-app-proxy.resources.configmap-documented-configs" . | fromYaml ) }}
-{{- $overrides := .Values.config }}
+{{- $overrides := omit .Values.config "clusterChunkSize" }}
 {{- $mergedConfig := mergeOverwrite $documentedConfigs $overrides }}
 apiVersion: v1
 kind: ConfigMap
diff --git a/charts/gitops-runtime/templates/_components/cap-app-proxy/environment-variables/_main-container.yaml b/charts/gitops-runtime/templates/_components/cap-app-proxy/environment-variables/_main-container.yaml
index 7cef698f..9b1bc3f3 100644
--- a/charts/gitops-runtime/templates/_components/cap-app-proxy/environment-variables/_main-container.yaml
+++ b/charts/gitops-runtime/templates/_components/cap-app-proxy/environment-variables/_main-container.yaml
@@ -36,6 +36,12 @@ CF_HOST:
       key: base-url
       optional: true
 CLUSTER: https://kubernetes.default.svc
+CLUSTER_CHUNK_SIZE:
+  valueFrom:
+    configMapKeyRef:
+      name: cap-app-proxy-cm
+      key: clusterChunkSize
+      optional: true
 CORS:
   valueFrom:
     configMapKeyRef:
diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml
index 11b0e0f1..7d807b1d 100644
--- a/charts/gitops-runtime/values.yaml
+++ b/charts/gitops-runtime/values.yaml
@@ -481,6 +481,11 @@ app-proxy:
     skipGitPermissionValidation: "false"
     # -- Log Level
     logLevel: "info"
+    # -- define cluster list size per request to report the cluster state to platform, e.g.
+    # if you have 90 clusters and set clusterChunkSize: 40, it means cron job will report cluster state to platform in 3 iterations (40,40,10)
+    # - reduce this value if you have a lot of clusters and the cron job is failing with payload too large error
+    # - use 0 to sync all clusters at once
+    clusterChunkSize: 50
 
   env: {}
 
diff --git a/installer-image/Dockerfile b/installer-image/Dockerfile
index 09d4b8cd..5e69fc19 100644
--- a/installer-image/Dockerfile
+++ b/installer-image/Dockerfile
@@ -1,4 +1,5 @@
-FROM debian:bullseye-slim
+#bookworm-slim
+FROM debian:12.9-slim
 
 ARG CF_CLI_VERSION=v0.1.70
 ARG TARGETARCH