diff --git a/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml b/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml
index 2f2c4a12..6bd19f5c 100644
--- a/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml
+++ b/charts/argo-cd/templates/argocd-configs/argocd-cm.yaml
@@ -14,8 +14,4 @@ metadata:
   {{- end }}
 data:
   {{- include "argo-cd.config.cm" . | trim | nindent 2 }}
-
-  {{- if and .Values.eventReporter.enabled .Values.eventReporter.version }}
-  codefresh.reporterVersion: {{ .Values.eventReporter.version | quote }}
-  {{- end }}
 {{- end }}
diff --git a/charts/argo-cd/templates/event-reporter/clusterrole.yaml b/charts/argo-cd/templates/event-reporter/clusterrole.yaml
index 7cfa1363..770f75ba 100644
--- a/charts/argo-cd/templates/event-reporter/clusterrole.yaml
+++ b/charts/argo-cd/templates/event-reporter/clusterrole.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.eventReporter.enabled }}
 {{- $config := .Values.eventReporter.clusterAdminAccess | default dict -}}
 {{- if hasKey $config "enabled" | ternary $config.enabled .Values.createClusterRoles }}
 apiVersion: rbac.authorization.k8s.io/v1
@@ -23,4 +22,3 @@ rules:
     - '*'
   {{- end }}
 {{- end }}
-{{- end }}
diff --git a/charts/argo-cd/templates/event-reporter/clusterrolebinding.yaml b/charts/argo-cd/templates/event-reporter/clusterrolebinding.yaml
index 27a413de..ef5417cd 100644
--- a/charts/argo-cd/templates/event-reporter/clusterrolebinding.yaml
+++ b/charts/argo-cd/templates/event-reporter/clusterrolebinding.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.eventReporter.enabled }}
 {{- $config := .Values.eventReporter.clusterAdminAccess | default dict -}}
 {{- if hasKey $config "enabled" | ternary $config.enabled .Values.createClusterRoles }}
 apiVersion: rbac.authorization.k8s.io/v1
@@ -16,4 +15,3 @@ subjects:
   name: {{ include "argo-cd.eventReporterServiceAccountName" . }}
   namespace: {{ .Release.Namespace }}
 {{- end }}
-{{- end }}
diff --git a/charts/argo-cd/templates/event-reporter/metrics.yaml b/charts/argo-cd/templates/event-reporter/metrics.yaml
index b18cd29d..91b35841 100644
--- a/charts/argo-cd/templates/event-reporter/metrics.yaml
+++ b/charts/argo-cd/templates/event-reporter/metrics.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.eventReporter.enabled .Values.eventReporter.metrics.enabled }}
+{{- if and .Values.eventReporter.metrics.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
diff --git a/charts/argo-cd/templates/event-reporter/networkpolicy.yaml b/charts/argo-cd/templates/event-reporter/networkpolicy.yaml
index 5ea63290..f0e027f2 100644
--- a/charts/argo-cd/templates/event-reporter/networkpolicy.yaml
+++ b/charts/argo-cd/templates/event-reporter/networkpolicy.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.eventReporter.enabled .Values.global.networkPolicy.create }}
+{{- if and .Values.global.networkPolicy.create }}
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
diff --git a/charts/argo-cd/templates/event-reporter/pdb.yaml b/charts/argo-cd/templates/event-reporter/pdb.yaml
index 9cc50321..f38e369e 100644
--- a/charts/argo-cd/templates/event-reporter/pdb.yaml
+++ b/charts/argo-cd/templates/event-reporter/pdb.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.eventReporter.enabled .Values.eventReporter.pdb.enabled }}
+{{- if and .Values.eventReporter.pdb.enabled }}
 apiVersion: policy/v1
 kind: PodDisruptionBudget
 metadata:
diff --git a/charts/argo-cd/templates/event-reporter/prometheusrule.yaml b/charts/argo-cd/templates/event-reporter/prometheusrule.yaml
index 3b3617bc..1bf582e3 100644
--- a/charts/argo-cd/templates/event-reporter/prometheusrule.yaml
+++ b/charts/argo-cd/templates/event-reporter/prometheusrule.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.eventReporter.enabled .Values.eventReporter.metrics.enabled .Values.eventReporter.metrics.rules.enabled }}
+{{- if and .Values.eventReporter.metrics.enabled .Values.eventReporter.metrics.rules.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: PrometheusRule
 metadata:
diff --git a/charts/argo-cd/templates/event-reporter/role.yaml b/charts/argo-cd/templates/event-reporter/role.yaml
index ee8b87a4..b2267cfc 100644
--- a/charts/argo-cd/templates/event-reporter/role.yaml
+++ b/charts/argo-cd/templates/event-reporter/role.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.eventReporter.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
@@ -41,4 +40,3 @@ rules:
   verbs:
     - create
     - list
-{{- end }}
diff --git a/charts/argo-cd/templates/event-reporter/rolebinding.yaml b/charts/argo-cd/templates/event-reporter/rolebinding.yaml
index 3e0a5bec..1f35e138 100644
--- a/charts/argo-cd/templates/event-reporter/rolebinding.yaml
+++ b/charts/argo-cd/templates/event-reporter/rolebinding.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.eventReporter.enabled }}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
@@ -14,4 +13,3 @@ subjects:
 - kind: ServiceAccount
   name: {{ template "argo-cd.eventReporterServiceAccountName" . }}
   namespace: {{ .Release.Namespace }}
-{{- end }}
diff --git a/charts/argo-cd/templates/event-reporter/serviceaccount.yaml b/charts/argo-cd/templates/event-reporter/serviceaccount.yaml
index 7f94d89b..ce47707b 100644
--- a/charts/argo-cd/templates/event-reporter/serviceaccount.yaml
+++ b/charts/argo-cd/templates/event-reporter/serviceaccount.yaml
@@ -1,4 +1,4 @@
-{{- if and .Values.eventReporter.enabled .Values.eventReporter.serviceAccount.create }}
+{{- if and .Values.eventReporter.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
 automountServiceAccountToken: {{ .Values.eventReporter.serviceAccount.automountServiceAccountToken }}
diff --git a/charts/argo-cd/templates/event-reporter/servicemonitor.yaml b/charts/argo-cd/templates/event-reporter/servicemonitor.yaml
index 2f4de038..9fc7421b 100644
--- a/charts/argo-cd/templates/event-reporter/servicemonitor.yaml
+++ b/charts/argo-cd/templates/event-reporter/servicemonitor.yaml
@@ -1,4 +1,4 @@
-{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.eventReporter.enabled .Values.eventReporter.metrics.enabled .Values.eventReporter.metrics.serviceMonitor.enabled }}
+{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.eventReporter.metrics.enabled .Values.eventReporter.metrics.serviceMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
diff --git a/charts/argo-cd/templates/event-reporter/statefulset.yaml b/charts/argo-cd/templates/event-reporter/statefulset.yaml
index f51cb53b..21c75f36 100644
--- a/charts/argo-cd/templates/event-reporter/statefulset.yaml
+++ b/charts/argo-cd/templates/event-reporter/statefulset.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.eventReporter.enabled }}
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
@@ -307,4 +306,3 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       dnsPolicy: {{ .Values.eventReporter.dnsPolicy }}
-{{- end }}