diff --git a/charts/gitops-runtime/Chart.yaml b/charts/gitops-runtime/Chart.yaml
index 0e4f4224..e1810cb5 100644
--- a/charts/gitops-runtime/Chart.yaml
+++ b/charts/gitops-runtime/Chart.yaml
@@ -20,6 +20,8 @@ annotations:
       description: Update argo-cd chart to 5.51.6-8-cap-2.9-2024.1.24-ccd7124b3. Includes: window rate limiter for the event reporter; support of apps in non-contoller namespaces for non-GRPC reporting mode; critical vuln fixes for argocd;
     - kind: changed
       description: Update argo-rollouts chart to 2.32.5-3-analysis-fix
+    - kind: changed
+      description: Update argo-workflows chart to 0.40.9-1-v3.5.4-cap-CR-22243
     - kind: fixed
       description: fix routing to workflows native UI
     - kind: changed
@@ -33,7 +35,7 @@ dependencies:
   version: 2.0.9-1-cap-CR-19893
 - name: argo-workflows
   repository: https://codefresh-io.github.io/argo-helm
-  version: 0.22.10-2-CR-20826
+  version: 0.40.9-1-v3.5.4-cap-CR-22243
   condition: argo-workflows.enabled
 - name: argo-rollouts
   repository: https://codefresh-io.github.io/argo-helm
diff --git a/charts/gitops-runtime/README.md b/charts/gitops-runtime/README.md
index c77e5561..eb7e7b57 100644
--- a/charts/gitops-runtime/README.md
+++ b/charts/gitops-runtime/README.md
@@ -100,14 +100,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.2608.0"` |  |
+| app-proxy.image.tag | string | `"1.2623.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.2608.0"` |  |
+| app-proxy.initContainer.image.tag | string | `"1.2623.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"` |  |
@@ -160,8 +160,8 @@ sealed-secrets:
 | argo-workflows.crds.install | bool | `true` | Install and upgrade CRDs |
 | argo-workflows.enabled | bool | `true` |  |
 | argo-workflows.fullnameOverride | string | `"argo"` |  |
+| argo-workflows.server.authModes | list | `["client"]` | auth-mode needs to be set to client to be able to see workflow logs from Codefresh UI |
 | argo-workflows.server.baseHref | string | `"/workflows/"` | Do not change. Workflows UI is only accessed through internal router, changing this values will break routing to workflows native UI from Codefresh. |
-| argo-workflows.server.extraArgs | list | `["--auth-mode=client"]` | auth-mode needs to be set to client to be able to see workflow logs from Codefresh UI |
 | 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 | `{}` |  |
diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml
index 1e7caa35..a21a8d0d 100644
--- a/charts/gitops-runtime/values.yaml
+++ b/charts/gitops-runtime/values.yaml
@@ -174,8 +174,8 @@ argo-workflows:
   enabled: true
   server:
     # -- auth-mode needs to be set to client to be able to see workflow logs from Codefresh UI
-    extraArgs:
-    - --auth-mode=client
+    authModes:
+    - client
     # -- Do not change. Workflows UI is only accessed through internal router, changing this values will break routing to workflows native UI from Codefresh.
     baseHref: /workflows/
   crds: