diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35a952cb322e5aba6cde6f8dea34ae686dc0b189..428e148be7f04c46b935ff72248ae85bf44b09bf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -80,7 +80,7 @@ include:
         - flux2/apps/monitoring/*.yaml
         - flux2/cluster/optional/monitoring/*.yaml
         - flux2/infrastructure/sources/grafana.yaml
-        - flux2/infrastructure/sources/helm-stable.yaml
+        - flux2/infrastructure/sources/wikimedia.yaml
         - flux2/infrastructure/sources/prometheus-community.yaml
         - install/install-app.sh
         - test/taiko/*
@@ -129,7 +129,6 @@ include:
     - changes:
         - flux2/apps/$RESOURCE/*.yaml
         - flux2/cluster/optional/$RESOURCE/*.yaml
-        - flux2/infrastructure/sources/helm-stable.yaml
         - install/install-app.sh
         - test/taiko/*
     - if: '$TRIGGER_JOBS =~ /enable-rocketchat/'
diff --git a/flux2/apps/monitoring/eventrouter-release.yaml b/flux2/apps/monitoring/eventrouter-release.yaml
index f238a4aef0167c02ca2f5435a5364f31b9970db0..3bc80fb59cc77c80b1a717420240e9e35afb9d80 100644
--- a/flux2/apps/monitoring/eventrouter-release.yaml
+++ b/flux2/apps/monitoring/eventrouter-release.yaml
@@ -11,10 +11,10 @@ spec:
       # https://github.com/helm/charts/tree/master/stable/eventrouter
       # In transitionto bitnami chart repo (https://github.com/bitnami/charts/pull/4698)
       chart: eventrouter
-      version: 0.3.2
+      version: 0.3.6
       sourceRef:
         kind: HelmRepository
-        name: helm-stable
+        name: wikimedia
         namespace: flux-system
   interval: 1h
   valuesFrom:
diff --git a/flux2/infrastructure/sources/kustomization.yaml b/flux2/infrastructure/sources/kustomization.yaml
index 6ffb569adc36919b025fd18dc09fe6c2a836276c..7e832c9b1c7bff90d1488bc36ff97746d4eb2127 100644
--- a/flux2/infrastructure/sources/kustomization.yaml
+++ b/flux2/infrastructure/sources/kustomization.yaml
@@ -5,7 +5,6 @@ namespace: flux-system
 resources:
   - bitnami.yaml
   - grafana.yaml
-  - helm-stable.yaml
   - ingress-nginx.yaml
   - jetstack.yaml
   - local-path-provisioner.yaml
@@ -15,4 +14,5 @@ resources:
   - single-sign-on.yaml
   - vmware-tanzu.yaml
   - wekan.yaml
+  - wikimedia.yaml
   - wordpress.yaml
diff --git a/flux2/infrastructure/sources/helm-stable.yaml b/flux2/infrastructure/sources/wikimedia.yaml
similarity index 60%
rename from flux2/infrastructure/sources/helm-stable.yaml
rename to flux2/infrastructure/sources/wikimedia.yaml
index aa6f80a825b49c4b004e9d60c6e283abc9199ddd..c1d536c2a935da69658ca85cfd50bbe36e249fae 100644
--- a/flux2/infrastructure/sources/helm-stable.yaml
+++ b/flux2/infrastructure/sources/wikimedia.yaml
@@ -2,7 +2,7 @@
 apiVersion: source.toolkit.fluxcd.io/v1beta1
 kind: HelmRepository
 metadata:
-  name: helm-stable
+  name: wikimedia
 spec:
   interval: 1h
-  url: https://charts.helm.sh/stable
+  url: https://helm-charts.wikimedia.org/stable/