diff --git a/cluster/apps/default/echo-server/helm-release.yaml b/cluster/apps/default/echo-server/helm-release.yaml
index 99bfa2c0..2b55fad7 100644
--- a/cluster/apps/default/echo-server/helm-release.yaml
+++ b/cluster/apps/default/echo-server/helm-release.yaml
@@ -12,7 +12,7 @@ spec:
       version: 1.1.2
       sourceRef:
         kind: HelmRepository
-        name: k8s-at-home-charts
+        name: k8s-at-home
         namespace: flux-system
       interval: 5m
   install:
diff --git a/cluster/apps/default/hajimari/helm-release.yaml b/cluster/apps/default/hajimari/helm-release.yaml
index 0cb241d0..20a2f2ed 100644
--- a/cluster/apps/default/hajimari/helm-release.yaml
+++ b/cluster/apps/default/hajimari/helm-release.yaml
@@ -12,7 +12,7 @@ spec:
       version: 1.2.0
       sourceRef:
         kind: HelmRepository
-        name: hajimari-charts
+        name: hajimari
         namespace: flux-system
       interval: 5m
   install:
diff --git a/cluster/apps/kube-system/kured/helm-release.yaml b/cluster/apps/kube-system/kured/helm-release.yaml
index 259bf60e..aa4aed1d 100644
--- a/cluster/apps/kube-system/kured/helm-release.yaml
+++ b/cluster/apps/kube-system/kured/helm-release.yaml
@@ -12,7 +12,7 @@ spec:
       version: 2.15.0
       sourceRef:
         kind: HelmRepository
-        name: weaveworks-kured-charts
+        name: weaveworks-kured
         namespace: flux-system
       interval: 5m
   install:
diff --git a/cluster/apps/kube-system/metrics-server/helm-release.yaml b/cluster/apps/kube-system/metrics-server/helm-release.yaml
index c7b70c75..f16f4666 100644
--- a/cluster/apps/kube-system/metrics-server/helm-release.yaml
+++ b/cluster/apps/kube-system/metrics-server/helm-release.yaml
@@ -12,7 +12,7 @@ spec:
       version: 3.8.2
       sourceRef:
         kind: HelmRepository
-        name: metrics-server-charts
+        name: metrics-server
         namespace: flux-system
       interval: 5m
   install:
diff --git a/cluster/apps/kube-system/reflector/helm-release.yaml b/cluster/apps/kube-system/reflector/helm-release.yaml
index 26da57fe..8585ddbc 100644
--- a/cluster/apps/kube-system/reflector/helm-release.yaml
+++ b/cluster/apps/kube-system/reflector/helm-release.yaml
@@ -12,7 +12,7 @@ spec:
       version: 6.1.47
       sourceRef:
         kind: HelmRepository
-        name: emberstack-charts
+        name: emberstack
         namespace: flux-system
       interval: 5m
   install:
diff --git a/cluster/apps/kube-system/reloader/helm-release.yaml b/cluster/apps/kube-system/reloader/helm-release.yaml
index fcaef95b..8ff4c68d 100644
--- a/cluster/apps/kube-system/reloader/helm-release.yaml
+++ b/cluster/apps/kube-system/reloader/helm-release.yaml
@@ -12,7 +12,7 @@ spec:
       version: v0.0.113
       sourceRef:
         kind: HelmRepository
-        name: stakater-charts
+        name: stakater
         namespace: flux-system
       interval: 5m
   install:
diff --git a/cluster/apps/networking/error-pages/helm-release.yaml b/cluster/apps/networking/error-pages/helm-release.yaml
index f7b2cd48..2618a7cd 100644
--- a/cluster/apps/networking/error-pages/helm-release.yaml
+++ b/cluster/apps/networking/error-pages/helm-release.yaml
@@ -12,7 +12,7 @@ spec:
       version: 1.1.2
       sourceRef:
         kind: HelmRepository
-        name: k8s-at-home-charts
+        name: k8s-at-home
         namespace: flux-system
       interval: 5m
   dependsOn:
diff --git a/cluster/apps/networking/external-dns/helm-release.yaml b/cluster/apps/networking/external-dns/helm-release.yaml
index 7de4d53c..99716609 100644
--- a/cluster/apps/networking/external-dns/helm-release.yaml
+++ b/cluster/apps/networking/external-dns/helm-release.yaml
@@ -12,7 +12,7 @@ spec:
       version: 1.9.0
       sourceRef:
         kind: HelmRepository
-        name: external-dns-charts
+        name: external-dns
         namespace: flux-system
       interval: 5m
   install:
diff --git a/cluster/apps/networking/traefik/helm-release.yaml b/cluster/apps/networking/traefik/helm-release.yaml
index 23ae3f53..c0c911dd 100644
--- a/cluster/apps/networking/traefik/helm-release.yaml
+++ b/cluster/apps/networking/traefik/helm-release.yaml
@@ -12,7 +12,7 @@ spec:
       version: 10.20.1
       sourceRef:
         kind: HelmRepository
-        name: traefik-charts
+        name: traefik
         namespace: flux-system
       interval: 5m
   dependsOn:
diff --git a/cluster/charts/bitnami.yaml b/cluster/charts/bitnami.yaml
index 7b6801d5..94200c29 100644
--- a/cluster/charts/bitnami.yaml
+++ b/cluster/charts/bitnami.yaml
@@ -2,7 +2,7 @@
 apiVersion: source.toolkit.fluxcd.io/v1beta2
 kind: HelmRepository
 metadata:
-  name: bitnami-charts
+  name: bitnami
   namespace: flux-system
 spec:
   interval: 30m
diff --git a/cluster/charts/emberstack.yaml b/cluster/charts/emberstack.yaml
index 9b667594..8331db31 100644
--- a/cluster/charts/emberstack.yaml
+++ b/cluster/charts/emberstack.yaml
@@ -2,7 +2,7 @@
 apiVersion: source.toolkit.fluxcd.io/v1beta2
 kind: HelmRepository
 metadata:
-  name: emberstack-charts
+  name: emberstack
   namespace: flux-system
 spec:
   interval: 30m
diff --git a/cluster/charts/external-dns.yaml b/cluster/charts/external-dns.yaml
index bc7aee01..9a4a4c76 100644
--- a/cluster/charts/external-dns.yaml
+++ b/cluster/charts/external-dns.yaml
@@ -2,7 +2,7 @@
 apiVersion: source.toolkit.fluxcd.io/v1beta2
 kind: HelmRepository
 metadata:
-  name: external-dns-charts
+  name: external-dns
   namespace: flux-system
 spec:
   interval: 30m
diff --git a/cluster/charts/hajimari.yaml b/cluster/charts/hajimari.yaml
index 48836790..889dbf56 100644
--- a/cluster/charts/hajimari.yaml
+++ b/cluster/charts/hajimari.yaml
@@ -2,7 +2,7 @@
 apiVersion: source.toolkit.fluxcd.io/v1beta2
 kind: HelmRepository
 metadata:
-  name: hajimari-charts
+  name: hajimari
   namespace: flux-system
 spec:
   interval: 30m
diff --git a/cluster/charts/jetstack.yaml b/cluster/charts/jetstack.yaml
index a755f79c..cc8fba10 100644
--- a/cluster/charts/jetstack.yaml
+++ b/cluster/charts/jetstack.yaml
@@ -2,7 +2,7 @@
 apiVersion: source.toolkit.fluxcd.io/v1beta2
 kind: HelmRepository
 metadata:
-  name: jetstack-charts
+  name: jetstack
   namespace: flux-system
 spec:
   interval: 30m
diff --git a/cluster/charts/k8s-at-home.yaml b/cluster/charts/k8s-at-home.yaml
index 34b96123..ef88fac7 100644
--- a/cluster/charts/k8s-at-home.yaml
+++ b/cluster/charts/k8s-at-home.yaml
@@ -2,7 +2,7 @@
 apiVersion: source.toolkit.fluxcd.io/v1beta2
 kind: HelmRepository
 metadata:
-  name: k8s-at-home-charts
+  name: k8s-at-home
   namespace: flux-system
 spec:
   interval: 30m
diff --git a/cluster/charts/metallb.yaml b/cluster/charts/metallb.yaml
index 0022ff1d..7282ee96 100644
--- a/cluster/charts/metallb.yaml
+++ b/cluster/charts/metallb.yaml
@@ -2,7 +2,7 @@
 apiVersion: source.toolkit.fluxcd.io/v1beta2
 kind: HelmRepository
 metadata:
-  name: metallb-charts
+  name: metallb
   namespace: flux-system
 spec:
   interval: 30m
diff --git a/cluster/charts/metrics-server.yaml b/cluster/charts/metrics-server.yaml
index 461c3a66..f2979334 100644
--- a/cluster/charts/metrics-server.yaml
+++ b/cluster/charts/metrics-server.yaml
@@ -2,7 +2,7 @@
 apiVersion: source.toolkit.fluxcd.io/v1beta2
 kind: HelmRepository
 metadata:
-  name: metrics-server-charts
+  name: metrics-server
   namespace: flux-system
 spec:
   interval: 30m
diff --git a/cluster/charts/stakater.yaml b/cluster/charts/stakater.yaml
index 07f2124d..c966cb28 100644
--- a/cluster/charts/stakater.yaml
+++ b/cluster/charts/stakater.yaml
@@ -2,9 +2,9 @@
 apiVersion: source.toolkit.fluxcd.io/v1beta2
 kind: HelmRepository
 metadata:
-  name: stakater-charts
+  name: stakater
   namespace: flux-system
 spec:
   interval: 30m
-  url: https://stakater.github.io/stakater-charts
+  url: https://stakater.github.io/stakater
   timeout: 3m
diff --git a/cluster/charts/traefik.yaml b/cluster/charts/traefik.yaml
index a59d3358..24d848ed 100644
--- a/cluster/charts/traefik.yaml
+++ b/cluster/charts/traefik.yaml
@@ -2,7 +2,7 @@
 apiVersion: source.toolkit.fluxcd.io/v1beta2
 kind: HelmRepository
 metadata:
-  name: traefik-charts
+  name: traefik
   namespace: flux-system
 spec:
   interval: 30m
diff --git a/cluster/charts/weaveworks-kured.yaml b/cluster/charts/weaveworks-kured.yaml
index 1cbbb75e..aabd3407 100644
--- a/cluster/charts/weaveworks-kured.yaml
+++ b/cluster/charts/weaveworks-kured.yaml
@@ -2,7 +2,7 @@
 apiVersion: source.toolkit.fluxcd.io/v1beta2
 kind: HelmRepository
 metadata:
-  name: weaveworks-kured-charts
+  name: weaveworks-kured
   namespace: flux-system
 spec:
   interval: 30m
diff --git a/cluster/core/cert-manager/helm-release.yaml b/cluster/core/cert-manager/helm-release.yaml
index 989e4ee3..0260e622 100644
--- a/cluster/core/cert-manager/helm-release.yaml
+++ b/cluster/core/cert-manager/helm-release.yaml
@@ -12,7 +12,7 @@ spec:
       version: v1.8.0
       sourceRef:
         kind: HelmRepository
-        name: jetstack-charts
+        name: jetstack
         namespace: flux-system
   install:
     createNamespace: true
diff --git a/cluster/core/metallb-system/helm-release.yaml b/cluster/core/metallb-system/helm-release.yaml
index 76c42af0..af65b48d 100644
--- a/cluster/core/metallb-system/helm-release.yaml
+++ b/cluster/core/metallb-system/helm-release.yaml
@@ -12,7 +12,7 @@ spec:
       version: 0.12.1
       sourceRef:
         kind: HelmRepository
-        name: metallb-charts
+        name: metallb
         namespace: flux-system
   install:
     createNamespace: true