diff --git a/bootstrap/tasks/addons/hajimari.yaml b/bootstrap/tasks/addons/homepage.yaml
similarity index 98%
rename from bootstrap/tasks/addons/hajimari.yaml
rename to bootstrap/tasks/addons/homepage.yaml
index c8b97610..636dd3a9 100644
--- a/bootstrap/tasks/addons/hajimari.yaml
+++ b/bootstrap/tasks/addons/homepage.yaml
@@ -1,7 +1,7 @@
 ---
 - name: Set addon facts
   ansible.builtin.set_fact:
-    addon_name: hajimari
+    addon_name: homepage
     addon_namespace: default
 
 - name: Ensure directories exist for {{ addon_namespace }}/{{ addon_name }}
diff --git a/bootstrap/tasks/addons/main.yaml b/bootstrap/tasks/addons/main.yaml
index 52fac11e..b97989f2 100644
--- a/bootstrap/tasks/addons/main.yaml
+++ b/bootstrap/tasks/addons/main.yaml
@@ -8,9 +8,9 @@
   when: csi_driver_nfs.enabled | default(false)
   ansible.builtin.include_tasks: csi_driver_nfs.yaml
 
-- name: Process addon hajimari
-  when: hajimari.enabled | default(false)
-  ansible.builtin.include_tasks: hajimari.yaml
+- name: Process addon homepage
+  when: homepage.enabled | default(false)
+  ansible.builtin.include_tasks: homepage.yaml
 
 - name: Process addon grafana
   when: grafana.enabled | default(false)
diff --git a/bootstrap/templates/addons/grafana/app/helmrelease.yaml.j2 b/bootstrap/templates/addons/grafana/app/helmrelease.yaml.j2
index fc17ff89..0b0ce0d5 100644
--- a/bootstrap/templates/addons/grafana/app/helmrelease.yaml.j2
+++ b/bootstrap/templates/addons/grafana/app/helmrelease.yaml.j2
@@ -159,8 +159,17 @@ spec:
     ingress:
       enabled: true
       ingressClassName: internal
+      {% if homepage.enabled | default(false) %}
       annotations:
-        hajimari.io/icon: simple-icons:grafana
+        gethomepage.dev/enabled: "true"
+        gethomepage.dev/icon: grafana.png
+        gethomepage.dev/name: Grafana
+        gethomepage.dev/group: Observability
+        gethomepage.dev/widget.type: grafana
+        gethomepage.dev/widget.url: http://grafana.observability
+        gethomepage.dev/widget.username: '{{`{{HOMEPAGE_VAR_GRAFANA_USERNAME}}`}}'
+        gethomepage.dev/widget.password: '{{`{{HOMEPAGE_VAR_GRAFANA_PASSWORD}}`}}'
+      {% endif %}
       hosts:
         - &host "grafana.${SECRET_DOMAIN}"
       tls:
diff --git a/bootstrap/templates/addons/hajimari/app/helmrelease.yaml.j2 b/bootstrap/templates/addons/hajimari/app/helmrelease.yaml.j2
deleted file mode 100644
index 39a58d5c..00000000
--- a/bootstrap/templates/addons/hajimari/app/helmrelease.yaml.j2
+++ /dev/null
@@ -1,65 +0,0 @@
----
-apiVersion: helm.toolkit.fluxcd.io/v2beta2
-kind: HelmRelease
-metadata:
-  name: hajimari
-spec:
-  interval: 30m
-  chart:
-    spec:
-      chart: hajimari
-      version: 2.0.2
-      sourceRef:
-        kind: HelmRepository
-        name: hajimari
-        namespace: flux-system
-  maxHistory: 2
-  install:
-    remediation:
-      retries: 3
-  upgrade:
-    cleanupOnFail: true
-    remediation:
-      retries: 3
-  uninstall:
-    keepHistory: false
-  values:
-    hajimari:
-      title: Apps
-      darkTheme: espresso
-      alwaysTargetBlank: true
-      showGreeting: false
-      showAppGroups: false
-      showAppStatus: false
-      showBookmarkGroups: false
-      showGlobalBookmarks: false
-      showAppUrls: false
-      defaultEnable: true
-      namespaceSelector:
-        matchNames:
-          - default
-          - observability
-    ingress:
-      main:
-        enabled: true
-        ingressClassName: internal
-        annotations:
-          hajimari.io/enable: "false"
-        hosts:
-          - host: &host "hajimari.${SECRET_DOMAIN}"
-            paths:
-              - path: /
-                pathType: Prefix
-        tls:
-          - hosts:
-              - *host
-    podAnnotations:
-      configmap.reloader.stakater.com/reload: hajimari-settings
-    persistence:
-      data:
-        enabled: true
-        type: emptyDir
-    resources:
-      requests:
-        cpu: 100m
-        memory: 128M
diff --git a/bootstrap/templates/addons/homepage/app/configmap.yaml.j2 b/bootstrap/templates/addons/homepage/app/configmap.yaml.j2
new file mode 100644
index 00000000..4b7b411c
--- /dev/null
+++ b/bootstrap/templates/addons/homepage/app/configmap.yaml.j2
@@ -0,0 +1,77 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: homepage-config
+  labels:
+    app.kubernetes.io/name: homepage
+data:
+  bookmarks.yaml: |
+    - Communitcate:
+        - Discord:
+            - icon: discord.png # https://github.com/walkxcode/dashboard-icons
+              href: 'https://discord.com/app'
+    - Media:
+        - YouTube:
+            - icon: youtube.png
+              href: 'https://youtube.com/feed/subscriptions'
+    - Reading:
+        - Reddit:
+            - icon: reddit.png
+              href: 'https://reddit.com'
+    - Git:
+        - kubesearch:
+            - icon: kubernetes-dashboard.png
+              href: 'https://kubesearch.dev/'
+        - flux-cluster-template:
+            - icon: github.png
+              href: 'https://github.com/onedr0p/flux-cluster-template'
+  docker.yaml: ""
+  kubernetes.yaml: |
+    mode: cluster
+  services.yaml: |
+    - Network:
+        - Cloudflared:
+            href: https://dash.cloudflare.com/
+            icon: cloudflare-zero-trust.png
+            description: Cloudflared Tunnel
+            widget:
+              type: cloudflared
+              accountid: {{HOMEPAGE_VAR_CLOUDFLARED_ACCOUNTID}}
+              tunnelid: {{HOMEPAGE_VAR_CLOUDFLARED_TUNNELID}}
+              key: {{HOMEPAGE_VAR_CLOUDFLARED_API_TOKEN}}
+  settings.yaml: |
+    title: Dashboard
+    theme: dark
+    color: slate
+    headerStyle: clean
+    layout:
+      Home:
+        style: column
+        icon: mdi-home-analytics
+      Network:
+        style: row
+        columns: 3
+        icon: mdi-server
+      Observability:
+        style: column
+        icon: mdi-chart-line
+  widgets.yaml: |
+    - resources:
+        backend: kubernetes
+        cpu: true
+        expanded: true
+        memory: true
+    - search:
+        provider: [duckduckgo]
+        focus: false
+        target: _blank
+    - greeting:
+        text_size: xl
+        text: "Welcome!"
+    - datetime:
+        text_size: l
+        format:
+          dateStyle: long
+          timeStyle: short
+          hourCycle: h23
diff --git a/bootstrap/templates/addons/homepage/app/helmrelease.yaml.j2 b/bootstrap/templates/addons/homepage/app/helmrelease.yaml.j2
new file mode 100644
index 00000000..7649155b
--- /dev/null
+++ b/bootstrap/templates/addons/homepage/app/helmrelease.yaml.j2
@@ -0,0 +1,88 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
+kind: HelmRelease
+metadata:
+  name: homepage
+spec:
+  interval: 30m
+  chart:
+    spec:
+      chart: app-template
+      version: 2.4.0
+      interval: 30m
+      sourceRef:
+        kind: HelmRepository
+        name: bjw-s
+        namespace: flux-system
+  maxHistory: 2
+  install:
+    createNamespace: true
+    remediation:
+      retries: 3
+  upgrade:
+    cleanupOnFail: true
+    remediation:
+      retries: 3
+  uninstall:
+    keepHistory: false
+  values:
+    controllers:
+      main:
+        annotations:
+          reloader.stakater.com/auto: "true"
+        containers:
+          main:
+            image:
+              repository: ghcr.io/gethomepage/homepage
+              tag: v0.8.4
+            env:
+              TZ: "${TIMEZONE}"
+            envFrom:
+              - secretRef:
+                  name: homepage-secret
+            resources:
+              requests:
+                cpu: 15m
+                memory: 100M
+              limits:
+                memory: 250M
+    service:
+      main:
+        ports:
+          http:
+            port: 3000
+    ingress:
+      main:
+        enabled: true
+        className: internal
+        hosts:
+          - host: &host home.${SECRET_DOMAIN}
+            paths:
+              - path: /
+                pathType: Prefix
+                service:
+                  name: main
+                  port: http
+        tls:
+          - hosts:
+              - *host
+    persistence:
+      config:
+        enabled: true
+        type: configMap
+        name: homepage-config
+        globalMounts:
+          - subPath: bookmarks.yaml
+            path: /app/config/bookmarks.yaml
+          - subPath: docker.yaml
+            path: /app/config/docker.yaml
+          - subPath: kubernetes.yaml
+            path: /app/config/kubernetes.yaml
+          - subPath: services.yaml
+            path: /app/config/services.yaml
+          - subPath: settings.yaml
+            path: /app/config/settings.yaml
+          - subPath: widgets.yaml
+            path: /app/config/widgets.yaml
+    serviceAccount:
+      create: true
diff --git a/bootstrap/templates/addons/hajimari/app/kustomization.yaml.j2 b/bootstrap/templates/addons/homepage/app/kustomization.yaml.j2
similarity index 69%
rename from bootstrap/templates/addons/hajimari/app/kustomization.yaml.j2
rename to bootstrap/templates/addons/homepage/app/kustomization.yaml.j2
index 5dd7baca..c1a01c52 100644
--- a/bootstrap/templates/addons/hajimari/app/kustomization.yaml.j2
+++ b/bootstrap/templates/addons/homepage/app/kustomization.yaml.j2
@@ -2,4 +2,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
+  - ./configmap.yaml
   - ./helmrelease.yaml
+  - ./secret.sops.yaml
diff --git a/bootstrap/templates/addons/homepage/app/secret.sops.yaml.j2 b/bootstrap/templates/addons/homepage/app/secret.sops.yaml.j2
new file mode 100644
index 00000000..609cb953
--- /dev/null
+++ b/bootstrap/templates/addons/homepage/app/secret.sops.yaml.j2
@@ -0,0 +1,11 @@
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: homepage-secret
+stringData:
+  HOMEPAGE_VAR_CLOUDFLARED_ACCOUNTID: "{{ bootstrap_cloudflare_account_tag }}"
+  HOMEPAGE_VAR_CLOUDFLARED_TUNNELID: "{{ bootstrap_cloudflare_tunnel_id }}"
+  HOMEPAGE_VAR_CLOUDFLARED_API_TOKEN: "{{ bootstrap_cloudflare_token }}"
+  HOMEPAGE_VAR_GRAFANA_USERNAME: admin
+  HOMEPAGE_VAR_GRAFANA_PASSWORD: "{{ grafana.password }}"
diff --git a/bootstrap/templates/addons/hajimari/ks.yaml.j2 b/bootstrap/templates/addons/homepage/ks.yaml.j2
similarity index 83%
rename from bootstrap/templates/addons/hajimari/ks.yaml.j2
rename to bootstrap/templates/addons/homepage/ks.yaml.j2
index 95582292..6466cb56 100644
--- a/bootstrap/templates/addons/hajimari/ks.yaml.j2
+++ b/bootstrap/templates/addons/homepage/ks.yaml.j2
@@ -2,14 +2,14 @@
 apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
-  name: &app hajimari
+  name: &app homepage
   namespace: flux-system
 spec:
   targetNamespace: default
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./kubernetes/apps/default/hajimari/app
+  path: ./kubernetes/apps/default/homepage/app
   prune: true
   sourceRef:
     kind: GitRepository
diff --git a/bootstrap/templates/addons/kube-prometheus-stack/app/helmvalues.yaml.j2 b/bootstrap/templates/addons/kube-prometheus-stack/app/helmvalues.yaml.j2
index f4d77532..0d29a238 100644
--- a/bootstrap/templates/addons/kube-prometheus-stack/app/helmvalues.yaml.j2
+++ b/bootstrap/templates/addons/kube-prometheus-stack/app/helmvalues.yaml.j2
@@ -93,9 +93,14 @@ data:
       ingress:
         enabled: true
         ingressClassName: internal
+        {% if homepage.enabled | default(false) %}
         annotations:
-          hajimari.io/appName: Prometheus
-          hajimari.io/icon: simple-icons:prometheus
+          gethomepage.dev/enabled: "true"
+          gethomepage.dev/icon: prometheus.png
+          gethomepage.dev/name: Prometheus
+          gethomepage.dev/group: Observability
+          gethomepage.dev/widget.type: prometheus
+        {% endif %}
         pathType: Prefix
         hosts:
           - "prometheus.${SECRET_DOMAIN}"
diff --git a/bootstrap/templates/addons/kubernetes-dashboard/app/helmrelease.yaml.j2 b/bootstrap/templates/addons/kubernetes-dashboard/app/helmrelease.yaml.j2
index 7ce43aef..8bc2a3eb 100644
--- a/bootstrap/templates/addons/kubernetes-dashboard/app/helmrelease.yaml.j2
+++ b/bootstrap/templates/addons/kubernetes-dashboard/app/helmrelease.yaml.j2
@@ -31,8 +31,13 @@ spec:
     ingress:
       enabled: true
       className: internal
-      annotations:
-        hajimari.io/icon: mdi:kubernetes
+        {% if homepage.enabled | default(false) %}
+        annotations:
+          gethomepage.dev/enabled: "true"
+          gethomepage.dev/icon: kubernetes-dashboard.png
+          gethomepage.dev/name: Kubernetes Dashboard
+          gethomepage.dev/group: Observability
+        {% endif %}
       hosts:
         - &host "kubernetes.${SECRET_DOMAIN}"
       tls:
diff --git a/bootstrap/templates/addons/weave-gitops/app/helmrelease.yaml.j2 b/bootstrap/templates/addons/weave-gitops/app/helmrelease.yaml.j2
index 39840e0d..04ecff6c 100644
--- a/bootstrap/templates/addons/weave-gitops/app/helmrelease.yaml.j2
+++ b/bootstrap/templates/addons/weave-gitops/app/helmrelease.yaml.j2
@@ -31,8 +31,13 @@ spec:
     ingress:
       enabled: true
       className: internal
+      {% if homepage.enabled | default(false) %}
       annotations:
-        hajimari.io/icon: sawtooth-wave
+        gethomepage.dev/enabled: "true"
+        gethomepage.dev/group: Home
+        gethomepage.dev/name: Weave-gitops
+        gethomepage.dev/icon: flux-cd.png
+      {% endif %}
       hosts:
         - host: &host "gitops.${SECRET_DOMAIN}"
           paths:
diff --git a/bootstrap/templates/kubernetes/apps/default/kustomization.yaml.j2 b/bootstrap/templates/kubernetes/apps/default/kustomization.yaml.j2
index 23a8573e..9a0c5c41 100644
--- a/bootstrap/templates/kubernetes/apps/default/kustomization.yaml.j2
+++ b/bootstrap/templates/kubernetes/apps/default/kustomization.yaml.j2
@@ -4,8 +4,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ./namespace.yaml
-  {% if hajimari.enabled | default(false) %}
-  - ./hajimari/ks.yaml
+  {% if homepage.enabled | default(false) %}
+  - ./homepage/ks.yaml
   {% endif %}
   {% if discord_template_notifier.enabled | default(false) %}
   - ./discord-template-notifier/ks.yaml
diff --git a/bootstrap/templates/kubernetes/apps/flux-system/addons/webhooks/github/ingress.yaml.j2 b/bootstrap/templates/kubernetes/apps/flux-system/addons/webhooks/github/ingress.yaml.j2
index 747a872d..74c0a0a6 100644
--- a/bootstrap/templates/kubernetes/apps/flux-system/addons/webhooks/github/ingress.yaml.j2
+++ b/bootstrap/templates/kubernetes/apps/flux-system/addons/webhooks/github/ingress.yaml.j2
@@ -5,7 +5,6 @@ metadata:
   name: flux-webhook
   annotations:
     external-dns.alpha.kubernetes.io/target: "external.${SECRET_DOMAIN}"
-    hajimari.io/enable: "false"
 spec:
   ingressClassName: external
   rules:
diff --git a/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helmvalues.yaml.j2 b/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helmvalues.yaml.j2
index c9f09aeb..2ef339ca 100644
--- a/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helmvalues.yaml.j2
+++ b/bootstrap/templates/kubernetes/apps/kube-system/cilium/app/helmvalues.yaml.j2
@@ -52,8 +52,13 @@ data:
         ingress:
           enabled: true
           className: internal
+          {% if homepage.enabled | default(false) %}
           annotations:
-            hajimari.io/icon: simple-icons:cilium
+            gethomepage.dev/enabled: "true"
+            gethomepage.dev/group: Network
+            gethomepage.dev/name: Cilium
+            gethomepage.dev/icon: cilium.png
+          {% endif %}
           hosts:
             - "hubble.${SECRET_DOMAIN}"
           tls:
diff --git a/bootstrap/templates/kubernetes/apps/network/echo-server/app/helmrelease.yaml.j2 b/bootstrap/templates/kubernetes/apps/network/echo-server/app/helmrelease.yaml.j2
index db8d0086..9daa7bbb 100644
--- a/bootstrap/templates/kubernetes/apps/network/echo-server/app/helmrelease.yaml.j2
+++ b/bootstrap/templates/kubernetes/apps/network/echo-server/app/helmrelease.yaml.j2
@@ -72,7 +72,12 @@ spec:
         className: external
         annotations:
           external-dns.alpha.kubernetes.io/target: "external.${SECRET_DOMAIN}"
-          hajimari.io/icon: video-input-antenna
+          {% if homepage.enabled | default(false) %}
+          gethomepage.dev/enabled: "true"
+          gethomepage.dev/group: Network
+          gethomepage.dev/name: Echo Server
+          gethomepage.dev/icon: mdi-video-input-antenna
+          {% endif %}
         hosts:
           - host: &host "{% raw %}{{ .Release.Name }}{% endraw %}.${SECRET_DOMAIN}"
             paths:
diff --git a/bootstrap/templates/kubernetes/flux/repositories/helm/hajimari.yaml.j2 b/bootstrap/templates/kubernetes/flux/repositories/helm/hajimari.yaml.j2
deleted file mode 100644
index e246f09b..00000000
--- a/bootstrap/templates/kubernetes/flux/repositories/helm/hajimari.yaml.j2
+++ /dev/null
@@ -1,9 +0,0 @@
----
-apiVersion: source.toolkit.fluxcd.io/v1beta2
-kind: HelmRepository
-metadata:
-  name: hajimari
-  namespace: flux-system
-spec:
-  interval: 1h
-  url: https://hajimari.io
diff --git a/bootstrap/templates/kubernetes/flux/repositories/helm/kustomization.yaml.j2 b/bootstrap/templates/kubernetes/flux/repositories/helm/kustomization.yaml.j2
index 36110075..e5744c78 100644
--- a/bootstrap/templates/kubernetes/flux/repositories/helm/kustomization.yaml.j2
+++ b/bootstrap/templates/kubernetes/flux/repositories/helm/kustomization.yaml.j2
@@ -11,7 +11,6 @@ resources:
   - ./descheduler.yaml
   - ./external-dns.yaml
   - ./grafana.yaml
-  - ./hajimari.yaml
   - ./ingress-nginx.yaml
   - ./jetstack.yaml
   - ./k8s-gateway.yaml
diff --git a/bootstrap/vars/addons.sample.yaml b/bootstrap/vars/addons.sample.yaml
index 7a0a5f23..c60b7d13 100644
--- a/bootstrap/vars/addons.sample.yaml
+++ b/bootstrap/vars/addons.sample.yaml
@@ -3,8 +3,8 @@
 # Addons configuration - addons.yaml is gitignored
 #
 
-# https://github.com/toboshii/hajimari
-hajimari:
+# https://gethomepage.dev
+homepage:
   enabled: false
 
 # https://github.com/grafana/grafana