diff --git a/core-services/weave-dashboard/kustomization.yaml b/core-services/headlamp/kustomization.yaml
similarity index 100%
rename from core-services/weave-dashboard/kustomization.yaml
rename to core-services/headlamp/kustomization.yaml
diff --git a/core-services/headlamp/release.yaml b/core-services/headlamp/release.yaml
new file mode 100644
index 0000000..c6a925e
--- /dev/null
+++ b/core-services/headlamp/release.yaml
@@ -0,0 +1,34 @@
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
+kind: HelmRelease
+metadata:
+  name: headlamp
+  namespace: kube-system
+spec:
+  chart:
+    spec:
+      chart: headlamp
+      version: 0.27.0
+      sourceRef:
+        kind: HelmRepository
+        name: headlamp
+  interval: 1h0m0s
+  values:
+    ingress:
+      enabled: true
+      ingressClassName: traefik
+      hosts:
+        - host: headlamp.totorinho.duckdns.org
+          paths:
+            - path: /
+              type: ImplementationSpecific
+      tls:
+        - secretName: duckdns-wildcard-cert-totorinho.duckdns.org
+          hosts:
+            - headlamp.totorinho.duckdns.org
+      annotations:
+        gethomepage.dev/name: Headlamp UI
+        gethomepage.dev/description: Kubernetes UI
+        gethomepage.dev/enabled: "true"
+        gethomepage.dev/group: Management
+        gethomepage.dev/icon: kubernetes.png
+        gethomepage.dev/pod-selector: "app.kubernetes.io/name=headlamp"
diff --git a/core-services/headlamp/repository.yaml b/core-services/headlamp/repository.yaml
new file mode 100644
index 0000000..5a61b1b
--- /dev/null
+++ b/core-services/headlamp/repository.yaml
@@ -0,0 +1,8 @@
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: HelmRepository
+metadata:
+  name: headlamp
+  namespace: kube-system
+spec:
+  interval: 1h0m0s
+  url: https://headlamp-k8s.github.io/headlamp/
diff --git a/core-services/kustomization.yaml b/core-services/kustomization.yaml
index 6a9b48e..fb2c354 100644
--- a/core-services/kustomization.yaml
+++ b/core-services/kustomization.yaml
@@ -1,5 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - weave-dashboard
+  - headlamp
   - monitoring
diff --git a/core-services/weave-dashboard/release.yaml b/core-services/weave-dashboard/release.yaml
deleted file mode 100644
index 3e30005..0000000
--- a/core-services/weave-dashboard/release.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
-kind: HelmRelease
-metadata:
-  annotations:
-    metadata.weave.works/description:
-      This is the Weave GitOps Dashboard.  It provides
-      a simple way to get insights into your GitOps workloads.
-  name: weave-dashboard
-  namespace: flux-system
-spec:
-  chart:
-    spec:
-      chart: weave-gitops
-      sourceRef:
-        kind: HelmRepository
-        name: weave-dashboard
-  interval: 1h0m0s
-  values:
-    adminUser:
-      create: true
-      passwordHash: $2a$10$JA02v0.HgwaJHwvimZii7OJ2rdBRTmeaMOtZ7Mq7TsOXoLY.JST9S
-      username: admin
-    ingress:
-      enabled: true
-      className: traefik
-      hosts:
-        - host: weave.totorinho.duckdns.org
-          paths:
-            - path: /
-              pathType: ImplementationSpecific
-      tls:
-        - secretName: duckdns-wildcard-cert-totorinho.duckdns.org
-          hosts:
-            - weave.totorinho.duckdns.org
-      annotations:
-        gethomepage.dev/name: Flux UI
-        gethomepage.dev/description: GitOps UI
-        gethomepage.dev/enabled: "true"
-        gethomepage.dev/group: Management
-        gethomepage.dev/icon: flux-cd.png
-        gethomepage.dev/pod-selector: "app.kubernetes.io/name=weave-gitops"
-    metrics:
-      enabled: true
diff --git a/core-services/weave-dashboard/repository.yaml b/core-services/weave-dashboard/repository.yaml
deleted file mode 100644
index 92364d9..0000000
--- a/core-services/weave-dashboard/repository.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: source.toolkit.fluxcd.io/v1beta2
-kind: HelmRepository
-metadata:
-  annotations:
-    metadata.weave.works/description:
-      This is the source location for the Weave GitOps
-      Dashboard's helm chart.
-  labels:
-    app.kubernetes.io/component: ui
-    app.kubernetes.io/created-by: weave-gitops-cli
-    app.kubernetes.io/name: weave-gitops-dashboard
-    app.kubernetes.io/part-of: weave-gitops
-  name: weave-dashboard
-  namespace: flux-system
-spec:
-  interval: 1h0m0s
-  type: oci
-  url: oci://ghcr.io/weaveworks/charts