diff --git a/.gitignore b/.gitignore
index 2786867ca..0d138b3a8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,6 @@ output
 .idea
 **/*.tgz
 **/charts/*/charts
+
+# only ignore the values.yaml file at the root of the repo
+/values.yaml
diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 52a757a03..7b3e97530 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: v2.10-2024.3.29-1dcc54e29
 kubeVersion: ">=1.23.0-0"
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 6.7.18-cap-2.10-2024.3.29-1dcc54e29
+version: 6.7.18-1-cap-2.10-2024.3.29-1dcc54e29
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md
index 68866a004..db6238eda 100644
--- a/charts/argo-cd/README.md
+++ b/charts/argo-cd/README.md
@@ -611,6 +611,11 @@ NAME: my-release
 | apiVersionOverrides | object | `{}` |  |
 | applicationVersioning.enabled | bool | `true` | enables the Codefresh application versioning feature |
 | applicationVersioning.useApplicationConfiguration | bool | `true` | use ApplicationConfiguration CRD to manage application versioning |
+| codefresh.promotions.notifications.context | object | `{}` |  |
+| codefresh.promotions.notifications.notifigers | object | `{}` |  |
+| codefresh.promotions.notifications.subscriptions | list | `[]` |  |
+| codefresh.promotions.notifications.templates | object | `{}` |  |
+| codefresh.promotions.notifications.triggers | object | `{}` |  |
 | crds.additionalLabels | object | `{}` | Addtional labels to be added to all CRDs |
 | crds.annotations | object | `{}` | Annotations to be added to all CRDs |
 | crds.install | bool | `true` | Install and upgrade CRDs |
diff --git a/charts/argo-cd/templates/argocd-configs/argocd-notifications-cm.yaml b/charts/argo-cd/templates/argocd-configs/argocd-notifications-cm.yaml
index 2a18a2fc6..4496fcd6d 100644
--- a/charts/argo-cd/templates/argocd-configs/argocd-notifications-cm.yaml
+++ b/charts/argo-cd/templates/argocd-configs/argocd-notifications-cm.yaml
@@ -9,20 +9,20 @@ metadata:
 data:
   context: |
     argocdUrl: {{ .Values.notifications.argocdUrl | default (printf "https://%s" .Values.global.domain) }}
-    {{- with .Values.notifications.context }}
+    {{- with (merge .Values.notifications.context .Values.codefresh.promotions.notifications.context) }}
       {{- toYaml . | nindent 4 }}
     {{- end }}
-  {{- with .Values.notifications.notifiers }}
+  {{- with (merge .Values.notifications.notifiers .Values.codefresh.promotions.notifications.notifiers) }}
     {{- toYaml . | nindent 2 }}
   {{- end }}
-  {{- with .Values.notifications.subscriptions }}
+  {{- with (concat .Values.notifications.subscriptions .Values.codefresh.promotions.notifications.subscriptions) }}
   subscriptions: |
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- with .Values.notifications.templates }}
+  {{- with (merge .Values.notifications.templates .Values.codefresh.promotions.notifications.templates) }}
     {{- toYaml . | nindent 2 }}
   {{- end }}
-  {{- with .Values.notifications.triggers }}
+  {{- with (merge .Values.notifications.triggers .Values.codefresh.promotions.notifications.triggers) }}
     {{- toYaml . | nindent 2 }}
   {{- end }}
 {{- end }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 205c1e016..e675db4eb 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -3821,3 +3821,12 @@ eventReporter:
     enabled: false
     # -- List of custom rules for the event reporter's ClusterRole resource
     rules: []
+
+codefresh:
+  promotions:
+    notifications:
+      context: {}
+      notifigers: {}
+      subscriptions: []
+      templates: {}
+      triggers: {}