diff --git a/charts/gitops-runtime/Chart.yaml b/charts/gitops-runtime/Chart.yaml
index 86c15e20..a964ea16 100644
--- a/charts/gitops-runtime/Chart.yaml
+++ b/charts/gitops-runtime/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 0.1.35
 description: A Helm chart for Codefresh gitops runtime
 name: gitops-runtime
-version: 0.2.20
+version: 0.2.21
 home: https://github.com/codefresh-io/gitops-runtime-helm
 icon: https://avatars1.githubusercontent.com/u/11412079?v=3
 keywords:
@@ -14,8 +14,10 @@ maintainers:
 annotations:
   artifacthub.io/alternativeName: "codefresh-gitops-runtime"
   artifacthub.io/changes: |
+    - kind: fixed
+      description: Fix argoCDServerServiceName and argoCDServerServicePort overrides
     - kind: changed
-      description: Update ArgoCD to v2.8.1-cap-CR-not-setup-kustomize-ns
+      description: Update app-proxy for ARM support
 dependencies:
 - name: argo-cd
   repository: https://codefresh-io.github.io/argo-helm
diff --git a/charts/gitops-runtime/README.md b/charts/gitops-runtime/README.md
index 8947011a..65b10636 100644
--- a/charts/gitops-runtime/README.md
+++ b/charts/gitops-runtime/README.md
@@ -1,5 +1,5 @@
 ## Codefresh gitops runtime
-![Version: 0.2.20](https://img.shields.io/badge/Version-0.2.20-informational?style=flat-square) ![AppVersion: 0.1.35](https://img.shields.io/badge/AppVersion-0.1.35-informational?style=flat-square)
+![Version: 0.2.21](https://img.shields.io/badge/Version-0.2.21-informational?style=flat-square) ![AppVersion: 0.1.35](https://img.shields.io/badge/AppVersion-0.1.35-informational?style=flat-square)
 
 ## Codefresh official documentation:
 Prior to running the installation please see the official documentation at: https://codefresh.io/docs/docs/installation/gitops/hybrid-gitops-helm-installation/
@@ -15,7 +15,7 @@ We have created a helper utility to resolve this issue:
 The utility is packaged in a container image. Below are instructions on executing the utility using Docker:
 
 ```
-docker run -v <output_dir>:/output quay.io/codefresh/gitops-runtime-private-registry-utils:0.2.20 <local_registry>
+docker run -v <output_dir>:/output quay.io/codefresh/gitops-runtime-private-registry-utils:0.2.21 <local_registry>
 ```
 `output_dir` - is a local directory where the utility will output files. <br>
 `local_registry` - is your local registry where you want to mirror the images to
@@ -88,14 +88,14 @@ sealed-secrets:
 | app-proxy.image-enrichment.serviceAccount.name | string | `"codefresh-image-enrichment-sa"` | Name of the service account to create or the name of the existing one to use |
 | app-proxy.image.pullPolicy | string | `"IfNotPresent"` |  |
 | app-proxy.image.repository | string | `"quay.io/codefresh/cap-app-proxy"` |  |
-| app-proxy.image.tag | string | `"1.2411.2"` |  |
+| app-proxy.image.tag | string | `"1.2472.0"` |  |
 | app-proxy.imagePullSecrets | list | `[]` |  |
 | app-proxy.initContainer.command[0] | string | `"./init.sh"` |  |
 | app-proxy.initContainer.env | object | `{}` |  |
 | app-proxy.initContainer.extraVolumeMounts | list | `[]` | Extra volume mounts for init container |
 | app-proxy.initContainer.image.pullPolicy | string | `"IfNotPresent"` |  |
 | app-proxy.initContainer.image.repository | string | `"quay.io/codefresh/cap-app-proxy-init"` |  |
-| app-proxy.initContainer.image.tag | string | `"1.2411.2"` |  |
+| app-proxy.initContainer.image.tag | string | `"1.2472.0"` |  |
 | app-proxy.initContainer.resources.limits.cpu | string | `"1"` |  |
 | app-proxy.initContainer.resources.limits.memory | string | `"512Mi"` |  |
 | app-proxy.initContainer.resources.requests.cpu | string | `"0.2"` |  |
@@ -146,20 +146,38 @@ sealed-secrets:
 | argo-workflows.fullnameOverride | string | `"argo"` |  |
 | event-reporters.events.argoCDServerServiceName | string | `nil` | LEAVE EMPTY and let the chart logic determine the name. Change only if you are totally sure you need to override ArgoCD service name. |
 | event-reporters.events.argoCDServerServicePort | string | `nil` | LEAVE EMPTY and let the chart logic determine the name. Change only if you are totally sure you need to override ArgoCD service port. |
+| event-reporters.events.eventSource.affinity | object | `{}` |  |
+| event-reporters.events.eventSource.nodeSelector | object | `{}` |  |
 | event-reporters.events.eventSource.replicas | int | `1` |  |
 | event-reporters.events.eventSource.resources | object | `{}` |  |
+| event-reporters.events.eventSource.tolerations | list | `[]` |  |
+| event-reporters.events.sensor.affinity | object | `{}` |  |
+| event-reporters.events.sensor.nodeSelector | object | `{}` |  |
 | event-reporters.events.sensor.replicas | int | `1` |  |
 | event-reporters.events.sensor.resources | object | `{}` |  |
+| event-reporters.events.sensor.tolerations | list | `[]` |  |
 | event-reporters.events.serviceAccount.create | bool | `true` |  |
+| event-reporters.rollout.eventSource.affinity | object | `{}` |  |
+| event-reporters.rollout.eventSource.nodeSelector | object | `{}` |  |
 | event-reporters.rollout.eventSource.replicas | int | `1` |  |
 | event-reporters.rollout.eventSource.resources | object | `{}` |  |
+| event-reporters.rollout.eventSource.tolerations | list | `[]` |  |
+| event-reporters.rollout.sensor.affinity | object | `{}` |  |
+| event-reporters.rollout.sensor.nodeSelector | object | `{}` |  |
 | event-reporters.rollout.sensor.replicas | int | `1` |  |
 | event-reporters.rollout.sensor.resources | object | `{}` |  |
+| event-reporters.rollout.sensor.tolerations | list | `[]` |  |
 | event-reporters.rollout.serviceAccount.create | bool | `true` |  |
+| event-reporters.workflow.eventSource.affinity | object | `{}` |  |
+| event-reporters.workflow.eventSource.nodeSelector | object | `{}` |  |
 | event-reporters.workflow.eventSource.replicas | int | `1` |  |
 | event-reporters.workflow.eventSource.resources | object | `{}` |  |
+| event-reporters.workflow.eventSource.tolerations | list | `[]` |  |
+| event-reporters.workflow.sensor.affinity | object | `{}` |  |
+| event-reporters.workflow.sensor.nodeSelector | object | `{}` |  |
 | event-reporters.workflow.sensor.replicas | int | `1` |  |
 | event-reporters.workflow.sensor.resources | object | `{}` |  |
+| event-reporters.workflow.sensor.tolerations | list | `[]` |  |
 | event-reporters.workflow.serviceAccount.create | bool | `true` |  |
 | global.codefresh | object | `{"accountId":"","apiEventsPath":"/2.0/api/events","tls":{"caCerts":{"secret":{"annotations":{},"content":"","create":false,"key":"ca-bundle.crt"},"secretKeyRef":{}},"workflowPipelinesGitWebhooks":{"annotatins":{},"certificates":{}}},"url":"https://g.codefresh.io","userToken":{"secretKeyRef":{},"token":""}}` | Codefresh platform and account-related settings |
 | global.codefresh.accountId | string | `""` | Codefresh Account ID. |
diff --git a/charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_event-source.yaml b/charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_event-source.yaml
index f3dbad55..65a2fc50 100644
--- a/charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_event-source.yaml
+++ b/charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_event-source.yaml
@@ -23,4 +23,16 @@ spec:
       {{- with .Values.events.eventSource.resources  }}
         {{- . | toYaml | nindent 8 }}
       {{- end }}
+    tolerations:
+    {{- with .Values.events.eventSource.tolerations }}
+      {{- . | toYaml | nindent 6 }}
+    {{- end }}
+    nodeSelector:
+    {{- with .Values.events.eventSource.nodeSelector }}
+      {{- . | toYaml | nindent 6 }}
+    {{- end }}
+    affinity:
+    {{- with .Values.events.eventSource.affinity }}
+      {{- . | toYaml | nindent 6 }}
+    {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_sensor.yaml b/charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_sensor.yaml
index 25cd0d9d..8fdc4656 100644
--- a/charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_sensor.yaml
+++ b/charts/gitops-runtime/templates/_components/event-reporters/events-reporter/_sensor.yaml
@@ -19,6 +19,18 @@ spec:
       {{- with .Values.events.sensor.resources  }}
         {{- . | toYaml | nindent 8 }}
       {{- end }}
+    tolerations:
+    {{- with .Values.events.sensor.tolerations }}
+      {{- . | toYaml | nindent 6 }}
+    {{- end }}
+    nodeSelector:
+    {{- with .Values.events.sensor.nodeSelector }}
+      {{- . | toYaml | nindent 6 }}
+    {{- end }}
+    affinity:
+    {{- with .Values.events.sensor.affinity }}
+      {{- . | toYaml | nindent 6 }}
+    {{- end }}
   triggers:
     {{- include "event-reporters.http.trigger" (dict "name" "events" "Values" .Values "payloadDest" "data") | nindent 4 }}
 {{- end }}
diff --git a/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_event-source.yaml b/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_event-source.yaml
index 054cc2b3..bb7dd8fe 100644
--- a/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_event-source.yaml
+++ b/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_event-source.yaml
@@ -47,4 +47,16 @@ spec:
         {{- . | toYaml | nindent 8 }}
       {{- end }}
     serviceAccountName: {{ include "event-reporters.rollout-reporter.serviceAccountName" .}}
+    tolerations:
+    {{- with .Values.rollout.eventSource.tolerations }}
+      {{- . | toYaml | nindent 6 }}
+    {{- end }}
+    nodeSelector:
+    {{- with .Values.rollout.eventSource.nodeSelector }}
+      {{- . | toYaml | nindent 6 }}
+    {{- end }}
+    affinity:
+    {{- with .Values.rollout.eventSource.affinity }}
+      {{- . | toYaml | nindent 6 }}
+    {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_sensor.yaml b/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_sensor.yaml
index 7ce035ef..e1e1d881 100644
--- a/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_sensor.yaml
+++ b/charts/gitops-runtime/templates/_components/event-reporters/rollout-reporter/_sensor.yaml
@@ -26,6 +26,18 @@ spec:
       {{- with .Values.rollout.eventSource.resources  }}
         {{- . | toYaml | nindent 8 }}
       {{- end }}
+    tolerations:
+    {{- with .Values.rollout.eventSource.tolerations }}
+      {{- . | toYaml | nindent 6 }}
+    {{- end }}
+    nodeSelector:
+    {{- with .Values.rollout.eventSource.nodeSelector }}
+      {{- . | toYaml | nindent 6 }}
+    {{- end }}
+    affinity:
+    {{- with .Values.rollout.eventSource.affinity }}
+      {{- . | toYaml | nindent 6 }}
+    {{- end }}
   triggers:
   {{- include "event-reporters.http.trigger" (dict "name" "rollouts" "Values" .Values "payloadDest" "data.object") | nindent 4 }}
   {{- include "event-reporters.http.trigger" (dict "name" "replicasets" "Values" .Values "payloadDest" "data.object") | nindent 4 }}
diff --git a/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_event-source.yaml b/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_event-source.yaml
index 5844d42e..b4a10f2f 100644
--- a/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_event-source.yaml
+++ b/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_event-source.yaml
@@ -28,4 +28,16 @@ spec:
         {{- . | toYaml | nindent 8 }}
       {{- end }}
     serviceAccountName: {{ include "event-reporters.workflow-reporter.serviceAccountName" .}}
+    tolerations:
+    {{- with .Values.workflow.eventSource.tolerations }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    nodeSelector:
+    {{- with .Values.workflow.eventSource.nodeSelector }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+    affinity:
+    {{- with .Values.workflow.eventSource.affinity }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_sensor.yaml b/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_sensor.yaml
index 9ec977ff..a6926c45 100644
--- a/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_sensor.yaml
+++ b/charts/gitops-runtime/templates/_components/event-reporters/workflow-reporter/_sensor.yaml
@@ -20,6 +20,18 @@ spec:
       {{- with .Values.workflow.sensor.resources  }}
         {{- . | toYaml | nindent 8 }}
       {{- end }}
+    tolerations:
+    {{- with .Values.workflow.sensor.tolerations }}
+      {{- . | toYaml | nindent 6 }}
+    {{- end }}
+    nodeSelector:
+    {{- with .Values.workflow.sensor.nodeSelector }}
+      {{- . | toYaml | nindent 6 }}
+    {{- end }}
+    affinity:
+    {{- with .Values.workflow.sensor.affinity }}
+      {{- . | toYaml | nindent 6 }}
+    {{- end }}
   triggers:
   {{- include "event-reporters.http.trigger" (dict "name" "workflows" "Values" .Values "payloadDest" "data.object") | nindent 4 }}
 {{- end }}
diff --git a/charts/gitops-runtime/templates/event-reporters/events-reporter/eventsource.yaml b/charts/gitops-runtime/templates/event-reporters/events-reporter/eventsource.yaml
index f3c45317..f5396885 100644
--- a/charts/gitops-runtime/templates/event-reporters/events-reporter/eventsource.yaml
+++ b/charts/gitops-runtime/templates/event-reporters/events-reporter/eventsource.yaml
@@ -2,6 +2,14 @@
 {{- $_ := set $eventReporterContext "Values" (get .Values "event-reporters") }}
 {{- $_ := set $eventReporterContext.Values "global" (get .Values "global") }}
 # should allow overwriting in values.yaml
-{{- $_ := set $eventReporterContext.Values.events "argoCDServerServiceName" ( include "codefresh-gitops-runtime.argocd.server.servicename" . ) }}
-{{- $_ := set $eventReporterContext.Values.events "argoCDServerServicePort" ( include "codefresh-gitops-runtime.argocd.server.serviceport" . ) }}
+{{- $argoCDServerServiceName := (include "codefresh-gitops-runtime.argocd.server.servicename" .) -}}
+{{- $argoCDServerServicePort := ( include "codefresh-gitops-runtime.argocd.server.serviceport" . ) -}}
+{{- if $eventReporterContext.Values.events.argoCDServerServiceName -}}
+  {{ $argoCDServerServiceName = $eventReporterContext.Values.events.argoCDServerServiceName }}
+{{- end -}}
+{{- if $eventReporterContext.Values.events.argoCDServerServicePort -}}
+  {{ $argoCDServerServicePort = $eventReporterContext.Values.events.argoCDServerServicePort }}
+{{- end -}}
+{{- $_ := set $eventReporterContext.Values.events "argoCDServerServiceName" $argoCDServerServiceName }}
+{{- $_ := set $eventReporterContext.Values.events "argoCDServerServicePort" $argoCDServerServicePort }}
 {{- include "event-reporters.events-reporter.eventsource" $eventReporterContext }}
\ No newline at end of file
diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml
index 783c29c2..84777519 100644
--- a/charts/gitops-runtime/values.yaml
+++ b/charts/gitops-runtime/values.yaml
@@ -183,27 +183,45 @@ event-reporters:
     eventSource:
       replicas: 1
       resources: {}
+      tolerations: []
+      nodeSelector: {}
+      affinity: {}
     sensor:
       replicas: 1
       resources: {}
+      tolerations: []
+      nodeSelector: {}
+      affinity: {}
   rollout:
     serviceAccount:
       create: true
     eventSource:
       replicas: 1
       resources: {}
+      tolerations: []
+      nodeSelector: {}
+      affinity: {}
     sensor:
       replicas: 1
       resources: {}
+      tolerations: []
+      nodeSelector: {}
+      affinity: {}
   workflow:
     serviceAccount:
       create: true
     eventSource:
       replicas: 1
       resources: {}
+      tolerations: []
+      nodeSelector: {}
+      affinity: {}
     sensor:
       replicas: 1
       resources: {}
+      tolerations: []
+      nodeSelector: {}
+      affinity: {}
 
 #-----------------------------------------------------------------------------------------------------------------------
 # Internal router
@@ -335,7 +353,7 @@ app-proxy:
           tag: 1.1.10-main
   image:
     repository: quay.io/codefresh/cap-app-proxy
-    tag: 1.2411.2
+    tag: 1.2472.0
     pullPolicy: IfNotPresent
   # -- Extra volume mounts for main container
   extraVolumeMounts: []
@@ -343,7 +361,7 @@ app-proxy:
   initContainer:
     image:
       repository: quay.io/codefresh/cap-app-proxy-init
-      tag: 1.2411.2
+      tag: 1.2472.0
       pullPolicy: IfNotPresent
     command:
       - ./init.sh