diff --git a/kubernetes/apps/default/hajimari/app/helmrelease.yaml b/.archive/kubernetes/hajimari/app/helmrelease.yaml
similarity index 100%
rename from kubernetes/apps/default/hajimari/app/helmrelease.yaml
rename to .archive/kubernetes/hajimari/app/helmrelease.yaml
diff --git a/kubernetes/apps/default/hajimari/app/kustomization.yaml b/.archive/kubernetes/hajimari/app/kustomization.yaml
similarity index 100%
rename from kubernetes/apps/default/hajimari/app/kustomization.yaml
rename to .archive/kubernetes/hajimari/app/kustomization.yaml
diff --git a/kubernetes/apps/default/hajimari/ks.yaml b/.archive/kubernetes/hajimari/ks.yaml
similarity index 100%
rename from kubernetes/apps/default/hajimari/ks.yaml
rename to .archive/kubernetes/hajimari/ks.yaml
diff --git a/kubernetes/apps/database/crunchy-postgres-operator/pgadmin/ingress.yaml b/kubernetes/apps/database/crunchy-postgres-operator/pgadmin/ingress.yaml
index b5e5d68c5..adc8c6f63 100644
--- a/kubernetes/apps/database/crunchy-postgres-operator/pgadmin/ingress.yaml
+++ b/kubernetes/apps/database/crunchy-postgres-operator/pgadmin/ingress.yaml
@@ -5,16 +5,15 @@ kind: Ingress
 metadata:
   name: pgadmin
   annotations:
-          hajimari.io/icon: mdi:database
-          gethomepage.dev/enabled: "true"
-          gethomepage.dev/name: pgAdmin
-          gethomepage.dev/description: PostgreSQL management tool.
-          gethomepage.dev/group: Infrrastructure
-          gethomepage.dev/icon: pgadmin.png
-          gethomepage.dev/pod-selector: >-
-            app in (
-              pgadmin
-            )
+    gethomepage.dev/enabled: "true"
+    gethomepage.dev/name: pgAdmin
+    gethomepage.dev/description: PostgreSQL management tool.
+    gethomepage.dev/group: Infrrastructure
+    gethomepage.dev/icon: pgadmin.png
+    gethomepage.dev/pod-selector: >-
+      app in (
+        pgadmin
+      )
 spec:
   ingressClassName: internal
   tls:
diff --git a/kubernetes/apps/default/atuin/app/helmrelease.yaml b/kubernetes/apps/default/atuin/app/helmrelease.yaml
index 44d9d6991..ab5af10dc 100644
--- a/kubernetes/apps/default/atuin/app/helmrelease.yaml
+++ b/kubernetes/apps/default/atuin/app/helmrelease.yaml
@@ -82,8 +82,6 @@ spec:
       app:
         enabled: true
         className: internal
-        annotations:
-          hajimari.io/icon: mdi:powershell
         hosts:
           - host: &host "sh.${SECRET_EXTERNAL_DOMAIN}"
             paths:
diff --git a/kubernetes/apps/default/authelia/app/helmrelease.yaml b/kubernetes/apps/default/authelia/app/helmrelease.yaml
index 81468fcf0..838cbd658 100644
--- a/kubernetes/apps/default/authelia/app/helmrelease.yaml
+++ b/kubernetes/apps/default/authelia/app/helmrelease.yaml
@@ -104,7 +104,6 @@ spec:
             add_header Pragma "no-cache";
             add_header X-Frame-Options "SAMEORIGIN";
             add_header X-XSS-Protection "1; mode=block";
-          hajimari.io/icon: mdi:shield-account
           gethomepage.dev/enabled: "true"
           gethomepage.dev/group: Infrastructure
           gethomepage.dev/name: Authelia
diff --git a/kubernetes/apps/default/bazarr/app/helmrelease.yaml b/kubernetes/apps/default/bazarr/app/helmrelease.yaml
index ab4caea6b..533fdf379 100644
--- a/kubernetes/apps/default/bazarr/app/helmrelease.yaml
+++ b/kubernetes/apps/default/bazarr/app/helmrelease.yaml
@@ -96,7 +96,6 @@ spec:
           nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
           nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
           nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:subtitles-outline
           gethomepage.dev/enabled: "true"
           gethomepage.dev/group: Media
           gethomepage.dev/name: Bazarr
diff --git a/kubernetes/apps/default/calibre/app/helmrelease.yaml b/kubernetes/apps/default/calibre/app/helmrelease.yaml
index 4a4445ed0..865d04f4a 100644
--- a/kubernetes/apps/default/calibre/app/helmrelease.yaml
+++ b/kubernetes/apps/default/calibre/app/helmrelease.yaml
@@ -51,7 +51,6 @@ spec:
           nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
           nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
           nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:bookshelf
           gethomepage.dev/enabled: "true"
           gethomepage.dev/group: Media
           gethomepage.dev/name: Calibre
diff --git a/kubernetes/apps/default/exercisediary/app/helmrelease.yaml b/kubernetes/apps/default/exercisediary/app/helmrelease.yaml
index 7de6695a6..8cb753f05 100644
--- a/kubernetes/apps/default/exercisediary/app/helmrelease.yaml
+++ b/kubernetes/apps/default/exercisediary/app/helmrelease.yaml
@@ -52,7 +52,6 @@ spec:
           nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
           nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
           nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:radio
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: exercisediary
           gethomepage.dev/description: Workout diary with GitHub-style year visualization.
diff --git a/kubernetes/apps/default/flood/app/helmrelease.yaml b/kubernetes/apps/default/flood/app/helmrelease.yaml
index bcdf8000d..be57f4273 100644
--- a/kubernetes/apps/default/flood/app/helmrelease.yaml
+++ b/kubernetes/apps/default/flood/app/helmrelease.yaml
@@ -62,7 +62,6 @@ spec:
           nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
           nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
           nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:download
           gethomepage.dev/enabled: "true"
           gethomepage.dev/group: Media
           gethomepage.dev/name: qBittorrent
diff --git a/kubernetes/apps/default/freshrss/app/helmrelease.yaml b/kubernetes/apps/default/freshrss/app/helmrelease.yaml
index e40e81c8d..0fdccf90a 100644
--- a/kubernetes/apps/default/freshrss/app/helmrelease.yaml
+++ b/kubernetes/apps/default/freshrss/app/helmrelease.yaml
@@ -56,7 +56,6 @@ spec:
         enabled: true
         className: internal
         annotations:
-          hajimari.io/icon: mdi:rss
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: FreshRSS
           gethomepage.dev/description: Developer platform to turn scripts into workflows and UIs
diff --git a/kubernetes/apps/default/frigate/app/helmrelease.yaml b/kubernetes/apps/default/frigate/app/helmrelease.yaml
index d15de454a..e46efd19e 100644
--- a/kubernetes/apps/default/frigate/app/helmrelease.yaml
+++ b/kubernetes/apps/default/frigate/app/helmrelease.yaml
@@ -92,7 +92,6 @@ spec:
           nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
           nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
           nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:cctv
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Frigate
           gethomepage.dev/description: NVR with realtime local object detection for IP cameras
diff --git a/kubernetes/apps/default/ghostfolio/app/helmrelease.yaml b/kubernetes/apps/default/ghostfolio/app/helmrelease.yaml
index a6d80a1e4..185b39829 100644
--- a/kubernetes/apps/default/ghostfolio/app/helmrelease.yaml
+++ b/kubernetes/apps/default/ghostfolio/app/helmrelease.yaml
@@ -68,7 +68,6 @@ spec:
         enabled: true
         className: internal
         annotations:
-          hajimari.io/icon: mdi:cash-multiple
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Ghostfolio
           gethomepage.dev/description: Open Source Wealth Management Software
diff --git a/kubernetes/apps/default/home-assistant/app/helmrelease.yaml b/kubernetes/apps/default/home-assistant/app/helmrelease.yaml
index f7de5a55e..5c6b85fb1 100644
--- a/kubernetes/apps/default/home-assistant/app/helmrelease.yaml
+++ b/kubernetes/apps/default/home-assistant/app/helmrelease.yaml
@@ -69,8 +69,6 @@ spec:
       app:
         enabled: true
         className: internal
-        annotations:
-          hajimari.io/icon: mdi:home-assistant
         hosts:
           - host: &host "hass.${SECRET_EXTERNAL_DOMAIN}"
             paths:
diff --git a/kubernetes/apps/default/homebox/app/helmrelease.yaml b/kubernetes/apps/default/homebox/app/helmrelease.yaml
index dfe1df0ed..a280c7d01 100644
--- a/kubernetes/apps/default/homebox/app/helmrelease.yaml
+++ b/kubernetes/apps/default/homebox/app/helmrelease.yaml
@@ -47,11 +47,6 @@ spec:
         enabled: true
         className: internal
         annotations:
-          hajimari.io/enable: "true"
-          hajimari.io/appName: *app
-          hajimari.io/info: Inventory management system
-          hajimari.io/icon: devices
-          hajimari.io/targetBlank: "true"
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Homebox
           gethomepage.dev/description: Inventory and organization system built for the Home User
diff --git a/kubernetes/apps/default/jellyfin/app/helmrelease.yaml b/kubernetes/apps/default/jellyfin/app/helmrelease.yaml
index 2a3fe30b6..e9844c231 100644
--- a/kubernetes/apps/default/jellyfin/app/helmrelease.yaml
+++ b/kubernetes/apps/default/jellyfin/app/helmrelease.yaml
@@ -101,8 +101,6 @@ spec:
       app:
         enabled: true
         className: external
-        annotations:
-          hajimari.io/icon: simple-icons:jellyfin
         hosts:
           - host: &host "{{ .Release.Name }}.${SECRET_EXTERNAL_DOMAIN}"
             paths:
diff --git a/kubernetes/apps/default/jellyseerr/app/helmrelease.yaml b/kubernetes/apps/default/jellyseerr/app/helmrelease.yaml
index 120ed3a94..1a74429a6 100644
--- a/kubernetes/apps/default/jellyseerr/app/helmrelease.yaml
+++ b/kubernetes/apps/default/jellyseerr/app/helmrelease.yaml
@@ -73,8 +73,6 @@ spec:
       app:
         enabled: true
         className: external
-        annotations:
-          hajimari.io/icon: simple-icons:jellyfish-outline
         hosts:
           - host: &host1 "{{ .Release.Name }}.${SECRET_EXTERNAL_DOMAIN}"
             paths: &paths
diff --git a/kubernetes/apps/default/joplin/app/helmrelease.yaml b/kubernetes/apps/default/joplin/app/helmrelease.yaml
index ab90385be..8f7faa64e 100644
--- a/kubernetes/apps/default/joplin/app/helmrelease.yaml
+++ b/kubernetes/apps/default/joplin/app/helmrelease.yaml
@@ -56,7 +56,6 @@ spec:
         enabled: true
         className: external
         annotations:
-          hajimari.io/icon: mdi:text
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Joplin
           gethomepage.dev/description: Secure note taking and to-do app with synchronisation capabilities
diff --git a/kubernetes/apps/default/komga/app/helmrelease.yaml b/kubernetes/apps/default/komga/app/helmrelease.yaml
index f6877cb83..c38d0cb4b 100644
--- a/kubernetes/apps/default/komga/app/helmrelease.yaml
+++ b/kubernetes/apps/default/komga/app/helmrelease.yaml
@@ -47,7 +47,6 @@ spec:
         enabled: true
         className: internal
         annotations:
-          hajimari.io/icon: mdi:ideogram-cjk-variant
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Komga
           gethomepage.dev/description: Media server for comics/mangas/BDs/magazines/eBooks with API and OPDS support
diff --git a/kubernetes/apps/default/kustomization.yaml b/kubernetes/apps/default/kustomization.yaml
index 12b7b321f..dbb359c58 100644
--- a/kubernetes/apps/default/kustomization.yaml
+++ b/kubernetes/apps/default/kustomization.yaml
@@ -16,7 +16,6 @@ resources:
   - ./freshrss/ks.yaml
   - ./frigate/ks.yaml
   - ./ghostfolio/ks.yaml
-  - ./hajimari/ks.yaml
   - ./home-assistant/ks.yaml
   - ./homebox/ks.yaml
   - ./homelab/ks.yaml
diff --git a/kubernetes/apps/default/libmedium/app/helmrelease.yaml b/kubernetes/apps/default/libmedium/app/helmrelease.yaml
index 062b80910..1e4d72733 100644
--- a/kubernetes/apps/default/libmedium/app/helmrelease.yaml
+++ b/kubernetes/apps/default/libmedium/app/helmrelease.yaml
@@ -48,7 +48,6 @@ spec:
           nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
           nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
           nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:file-document-arrow-right-outline
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Libmedium
           gethomepage.dev/description: Medium.com
diff --git a/kubernetes/apps/default/lidarr/app/helmrelease.yaml b/kubernetes/apps/default/lidarr/app/helmrelease.yaml
index 4c640d488..3be75d9e6 100644
--- a/kubernetes/apps/default/lidarr/app/helmrelease.yaml
+++ b/kubernetes/apps/default/lidarr/app/helmrelease.yaml
@@ -69,7 +69,6 @@ spec:
           nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
           nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
           nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:headphones
         hosts:
           - host: *host
             paths:
diff --git a/kubernetes/apps/default/linkding/app/helmrelease.yaml b/kubernetes/apps/default/linkding/app/helmrelease.yaml
index 937a557af..9e37ffec4 100644
--- a/kubernetes/apps/default/linkding/app/helmrelease.yaml
+++ b/kubernetes/apps/default/linkding/app/helmrelease.yaml
@@ -60,7 +60,6 @@ spec:
         enabled: true
         className: internal
         annotations:
-          hajimari.io/icon: link
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Linkding
           gethomepage.dev/description: Bookmark manager that is designed be to be minimal and fast
diff --git a/kubernetes/apps/default/lldap/app/helmrelease.yaml b/kubernetes/apps/default/lldap/app/helmrelease.yaml
index 10d50f246..d7aab222a 100644
--- a/kubernetes/apps/default/lldap/app/helmrelease.yaml
+++ b/kubernetes/apps/default/lldap/app/helmrelease.yaml
@@ -58,7 +58,6 @@ spec:
       app:
         enabled: true
         annotations:
-          hajimari.io/icon: mdi:account-multiple
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: lldap
           gethomepage.dev/description: Light LDAP implementation
diff --git a/kubernetes/apps/default/lms/app/helmrelease.yaml b/kubernetes/apps/default/lms/app/helmrelease.yaml
index 9ce553ee1..df1ae2b69 100644
--- a/kubernetes/apps/default/lms/app/helmrelease.yaml
+++ b/kubernetes/apps/default/lms/app/helmrelease.yaml
@@ -62,7 +62,6 @@ spec:
         enabled: true
         className: internal
         annotations:
-          hajimari.io/icon: mdi:file-music
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Lyrion Music Server
           gethomepage.dev/description: Stream not only your local music collection, but content from many music services and internet radio stations to your players.
diff --git a/kubernetes/apps/default/lychee/app/helmrelease.yaml b/kubernetes/apps/default/lychee/app/helmrelease.yaml
index 67a610a4b..e4fc05dee 100644
--- a/kubernetes/apps/default/lychee/app/helmrelease.yaml
+++ b/kubernetes/apps/default/lychee/app/helmrelease.yaml
@@ -77,7 +77,6 @@ spec:
         enabled: true
         className: external
         annotations:
-          hajimari.io/icon: mdi:camera
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Lychee
           gethomepage.dev/description: Photo-management tool.
diff --git a/kubernetes/apps/default/navidrome/app/helmrelease.yaml b/kubernetes/apps/default/navidrome/app/helmrelease.yaml
index 54f790da2..4b1cb829b 100644
--- a/kubernetes/apps/default/navidrome/app/helmrelease.yaml
+++ b/kubernetes/apps/default/navidrome/app/helmrelease.yaml
@@ -64,7 +64,6 @@ spec:
           nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
           nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
           nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:music
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Navidrome
           gethomepage.dev/description: Modern music server and streamer compatible with subsonic/airsonic.
diff --git a/kubernetes/apps/default/outline/app/helmrelease.yaml b/kubernetes/apps/default/outline/app/helmrelease.yaml
index 9962c96cc..0ff038e04 100644
--- a/kubernetes/apps/default/outline/app/helmrelease.yaml
+++ b/kubernetes/apps/default/outline/app/helmrelease.yaml
@@ -81,7 +81,6 @@ spec:
         enabled: true
         className: internal
         annotations:
-          hajimari.io/icon: mdi:text-box-multiple
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Outline
           gethomepage.dev/description: A fast, collaborative, knowledge base.
diff --git a/kubernetes/apps/default/paperless/app/helmrelease.yaml b/kubernetes/apps/default/paperless/app/helmrelease.yaml
index c13c38db5..ac918b15b 100644
--- a/kubernetes/apps/default/paperless/app/helmrelease.yaml
+++ b/kubernetes/apps/default/paperless/app/helmrelease.yaml
@@ -66,7 +66,6 @@ spec:
         enabled: true
         className: internal
         annotations:
-          hajimari.io/icon: mdi:barcode-scan
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Paperless
           gethomepage.dev/description: Document management system that transform physical documents into a searchable online archive.
diff --git a/kubernetes/apps/default/prowlarr/app/helmrelease.yaml b/kubernetes/apps/default/prowlarr/app/helmrelease.yaml
index 4b4b69978..c171cf469 100644
--- a/kubernetes/apps/default/prowlarr/app/helmrelease.yaml
+++ b/kubernetes/apps/default/prowlarr/app/helmrelease.yaml
@@ -65,7 +65,6 @@ spec:
           nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
           nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
           nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:movie-search
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Prowlarr
           gethomepage.dev/description: Torrent and Usenet Indexer manager/proxy.
diff --git a/kubernetes/apps/default/qbittorrent/app/helmrelease.yaml b/kubernetes/apps/default/qbittorrent/app/helmrelease.yaml
index db14f9dba..102fc4c76 100644
--- a/kubernetes/apps/default/qbittorrent/app/helmrelease.yaml
+++ b/kubernetes/apps/default/qbittorrent/app/helmrelease.yaml
@@ -63,8 +63,6 @@ spec:
       app:
         enabled: true
         className: internal
-        annotations:
-          hajimari.io/icon: mdi:download
         hosts:
           - host: &host "{{ .Release.Name }}.${SECRET_EXTERNAL_DOMAIN}"
             paths:
diff --git a/kubernetes/apps/default/radarr/app/helmrelease.yaml b/kubernetes/apps/default/radarr/app/helmrelease.yaml
index b76039c6b..bee26b1f6 100644
--- a/kubernetes/apps/default/radarr/app/helmrelease.yaml
+++ b/kubernetes/apps/default/radarr/app/helmrelease.yaml
@@ -75,7 +75,6 @@ spec:
           nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
           nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
           nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:filmstrip
         hosts:
           - host: *host
             paths:
diff --git a/kubernetes/apps/default/readeck/app/helmrelease.yaml b/kubernetes/apps/default/readeck/app/helmrelease.yaml
index 2fda734fa..d083ab970 100644
--- a/kubernetes/apps/default/readeck/app/helmrelease.yaml
+++ b/kubernetes/apps/default/readeck/app/helmrelease.yaml
@@ -58,7 +58,6 @@ spec:
           nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
           nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
           nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:fa-book
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Readeck
           gethomepage.dev/description: Saves the precious readable content of web pages to keep forever.
diff --git a/kubernetes/apps/default/redlib/app/helmrelease.yaml b/kubernetes/apps/default/redlib/app/helmrelease.yaml
index 0a28a8801..80defa744 100644
--- a/kubernetes/apps/default/redlib/app/helmrelease.yaml
+++ b/kubernetes/apps/default/redlib/app/helmrelease.yaml
@@ -61,7 +61,6 @@ spec:
           nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
           nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
           nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:web
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Redlib
           gethomepage.dev/description: Reddit.com
diff --git a/kubernetes/apps/default/sabnzbd/app/helmrelease.yaml b/kubernetes/apps/default/sabnzbd/app/helmrelease.yaml
index 67e486c21..bb7548e83 100644
--- a/kubernetes/apps/default/sabnzbd/app/helmrelease.yaml
+++ b/kubernetes/apps/default/sabnzbd/app/helmrelease.yaml
@@ -88,7 +88,6 @@ spec:
           # nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
           # nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
           # nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:download
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: SABnzbd
           gethomepage.dev/description: Automated Usenet download tool.
diff --git a/kubernetes/apps/default/sharry/app/helmrelease.yaml b/kubernetes/apps/default/sharry/app/helmrelease.yaml
index 3b6c1630f..5fb2a0334 100644
--- a/kubernetes/apps/default/sharry/app/helmrelease.yaml
+++ b/kubernetes/apps/default/sharry/app/helmrelease.yaml
@@ -50,7 +50,6 @@ spec:
         className: external
         annotations:
           nginx.ingress.kubernetes.io/proxy-body-size: "0"
-          hajimari.io/icon: mdi:account-arrow-up
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Sharry
           gethomepage.dev/description: Share files with others in a simple way.
diff --git a/kubernetes/apps/default/sonarr/app/helmrelease.yaml b/kubernetes/apps/default/sonarr/app/helmrelease.yaml
index 79952fd82..53af34166 100644
--- a/kubernetes/apps/default/sonarr/app/helmrelease.yaml
+++ b/kubernetes/apps/default/sonarr/app/helmrelease.yaml
@@ -88,7 +88,6 @@ spec:
           nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
           nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
           nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:television-classic
         hosts:
           - host: &host "{{ .Release.Name }}.${SECRET_EXTERNAL_DOMAIN}"
             paths:
diff --git a/kubernetes/apps/default/tandoor/app/helmrelease.yaml b/kubernetes/apps/default/tandoor/app/helmrelease.yaml
index e6f8f31e9..2830c844d 100644
--- a/kubernetes/apps/default/tandoor/app/helmrelease.yaml
+++ b/kubernetes/apps/default/tandoor/app/helmrelease.yaml
@@ -97,7 +97,6 @@ spec:
         enabled: true
         className: internal
         annotations:
-          hajimari.io/icon: mdi:chef-hat
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Tandoor
           gethomepage.dev/description: Managing recipes, planned meals, shopping lists.
diff --git a/kubernetes/apps/default/tdarr/app/helmrelease.yaml b/kubernetes/apps/default/tdarr/app/helmrelease.yaml
index 241d07d90..18d68fcd3 100644
--- a/kubernetes/apps/default/tdarr/app/helmrelease.yaml
+++ b/kubernetes/apps/default/tdarr/app/helmrelease.yaml
@@ -61,7 +61,6 @@ spec:
           nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
           nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
           nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: material-symbols:switch-video-outline
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Tdarr
           gethomepage.dev/description: Distributed transcode automation using FFmpeg/HandBrake + Audio/Video library analytics.
diff --git a/kubernetes/apps/default/unifi/app/helmrelease.yaml b/kubernetes/apps/default/unifi/app/helmrelease.yaml
index 7db07826a..dd1849678 100644
--- a/kubernetes/apps/default/unifi/app/helmrelease.yaml
+++ b/kubernetes/apps/default/unifi/app/helmrelease.yaml
@@ -83,7 +83,6 @@ spec:
         className: internal
         annotations:
           nginx.ingress.kubernetes.io/backend-protocol: HTTPS
-          hajimari.io/icon: mdi:lan
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Unifi
           gethomepage.dev/description: Centralized enterprise-grade networking for home and business.
diff --git a/kubernetes/apps/default/vaultwarden/app/helmrelease.yaml b/kubernetes/apps/default/vaultwarden/app/helmrelease.yaml
index 7841c67f5..0bf1341cb 100644
--- a/kubernetes/apps/default/vaultwarden/app/helmrelease.yaml
+++ b/kubernetes/apps/default/vaultwarden/app/helmrelease.yaml
@@ -65,7 +65,6 @@ spec:
         enabled: true
         className: external
         annotations:
-          hajimari.io/icon: mdi:lock
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Vaultwarden
           gethomepage.dev/description: Open-source password manager compatible with Bitwarden clients.
diff --git a/kubernetes/apps/default/vikunja/app/helmrelease.yaml b/kubernetes/apps/default/vikunja/app/helmrelease.yaml
index 01465d834..0b0345590 100644
--- a/kubernetes/apps/default/vikunja/app/helmrelease.yaml
+++ b/kubernetes/apps/default/vikunja/app/helmrelease.yaml
@@ -57,7 +57,6 @@ spec:
         annotations:
           external-dns.alpha.kubernetes.io/enabled: "true"
           external-dns.alpha.kubernetes.io/target: services.${SECRET_DOMAIN}.
-          hajimari.io/icon: mdi:format-list-checks
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Vikunja
           gethomepage.dev/description: Tasks and project management platform.
diff --git a/kubernetes/apps/default/zigbee2mqtt/app/helmrelease.yaml b/kubernetes/apps/default/zigbee2mqtt/app/helmrelease.yaml
index 2d3619b18..39853f454 100644
--- a/kubernetes/apps/default/zigbee2mqtt/app/helmrelease.yaml
+++ b/kubernetes/apps/default/zigbee2mqtt/app/helmrelease.yaml
@@ -84,7 +84,6 @@ spec:
           nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
           nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
           nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:zigbee
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Zigbee2mqtt
           gethomepage.dev/description: Bridge for connecting Zigbee devices to MQTT networks.
diff --git a/kubernetes/apps/default/zwave-js-ui/app/helmrelease.yaml b/kubernetes/apps/default/zwave-js-ui/app/helmrelease.yaml
index 73cf467f9..b90c57c8b 100644
--- a/kubernetes/apps/default/zwave-js-ui/app/helmrelease.yaml
+++ b/kubernetes/apps/default/zwave-js-ui/app/helmrelease.yaml
@@ -83,7 +83,6 @@ spec:
           nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
           nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
           nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/icon: mdi:z-wave
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Zwave-js-ui
           gethomepage.dev/description: Bridge for connecting Zwave devices to MQTT networks.
diff --git a/kubernetes/apps/external-secrets/external-secrets/stores/onepassword/helm/values.yaml b/kubernetes/apps/external-secrets/external-secrets/stores/onepassword/helm/values.yaml
index fab9b001d..0d8196046 100644
--- a/kubernetes/apps/external-secrets/external-secrets/stores/onepassword/helm/values.yaml
+++ b/kubernetes/apps/external-secrets/external-secrets/stores/onepassword/helm/values.yaml
@@ -92,8 +92,6 @@ service:
 #   app:
 #     enabled: true
 #     className: internal
-#     annotations:
-#       hajimari.io/enable: "false"
 #     hosts:
 #       - host: &host "{{ .Release.Name }}.${SECRET_EXTERNAL_DOMAIN}"
 #         paths:
diff --git a/kubernetes/apps/flux-system/flux-instance/app/ingress.yaml b/kubernetes/apps/flux-system/flux-instance/app/ingress.yaml
index 803c0c2f2..c3432ee2c 100644
--- a/kubernetes/apps/flux-system/flux-instance/app/ingress.yaml
+++ b/kubernetes/apps/flux-system/flux-instance/app/ingress.yaml
@@ -3,8 +3,6 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: webhook-receiver
-  annotations:
-    hajimari.io/enable: "false"
 spec:
   ingressClassName: external
   rules:
diff --git a/kubernetes/apps/flux-system/repositories/helm/external-dns.yaml b/kubernetes/apps/flux-system/repositories/helm/external-dns.yaml
deleted file mode 100644
index 2392dac23..000000000
--- a/kubernetes/apps/flux-system/repositories/helm/external-dns.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: external-dns
-  namespace: flux-system
-spec:
-  interval: 2h
-  url: https://kubernetes-sigs.github.io/external-dns
diff --git a/kubernetes/apps/flux-system/repositories/helm/external-secrets.yaml b/kubernetes/apps/flux-system/repositories/helm/external-secrets.yaml
deleted file mode 100644
index 2acd768af..000000000
--- a/kubernetes/apps/flux-system/repositories/helm/external-secrets.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: external-secrets
-  namespace: flux-system
-spec:
-  interval: 2h
-  url: https://charts.external-secrets.io
diff --git a/kubernetes/apps/flux-system/repositories/helm/grafana.yaml b/kubernetes/apps/flux-system/repositories/helm/grafana.yaml
deleted file mode 100644
index 80fac2083..000000000
--- a/kubernetes/apps/flux-system/repositories/helm/grafana.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: grafana
-  namespace: flux-system
-spec:
-  interval: 2h
-  url: https://grafana.github.io/helm-charts
-  timeout: 3m
diff --git a/kubernetes/apps/flux-system/repositories/helm/hajimari.yaml b/kubernetes/apps/flux-system/repositories/helm/hajimari.yaml
deleted file mode 100644
index 0e027a1f0..000000000
--- a/kubernetes/apps/flux-system/repositories/helm/hajimari.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1.json
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: HelmRepository
-metadata:
-  name: hajimari
-  namespace: flux-system
-spec:
-  interval: 2h
-  url: https://hajimari.io
diff --git a/kubernetes/apps/flux-system/repositories/helm/kustomization.yaml b/kubernetes/apps/flux-system/repositories/helm/kustomization.yaml
index 631af6605..bc45dd5a3 100644
--- a/kubernetes/apps/flux-system/repositories/helm/kustomization.yaml
+++ b/kubernetes/apps/flux-system/repositories/helm/kustomization.yaml
@@ -3,10 +3,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - ./external-dns.yaml
-  - ./external-secrets.yaml
-  - ./grafana.yaml
-  - ./hajimari.yaml
   - ./ingress-nginx.yaml
   - ./jetstack.yaml
   - ./k8s-gateway.yaml
diff --git a/kubernetes/apps/network/external-dns/cloudflare/helmrelease.yaml b/kubernetes/apps/network/external-dns/cloudflare/helmrelease.yaml
index b2f58d028..91f33170b 100644
--- a/kubernetes/apps/network/external-dns/cloudflare/helmrelease.yaml
+++ b/kubernetes/apps/network/external-dns/cloudflare/helmrelease.yaml
@@ -1,4 +1,13 @@
 ---
+apiVersion: source.toolkit.fluxcd.io/v1beta1
+kind: HelmRepository
+metadata:
+  name: external-dns
+  namespace: dns
+spec:
+  interval: 1h
+  url: https://kubernetes-sigs.github.io/external-dns/
+---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2.json
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
@@ -13,7 +22,6 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: external-dns
-        namespace: flux-system
   install:
     crds: CreateReplace
     remediation:
diff --git a/kubernetes/apps/ngnode/kustomization.yaml b/kubernetes/apps/ngnode/kustomization.yaml
index 170bb3125..267cd07d1 100644
--- a/kubernetes/apps/ngnode/kustomization.yaml
+++ b/kubernetes/apps/ngnode/kustomization.yaml
@@ -2,9 +2,8 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/kustomization.json
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+components:
+  - ../../components/common
 resources:
-  # Pre Flux-Kustomizations
-  - ./namespace.yaml
-  # Flux-Kustomizations
   - ./landing-page/ks.yaml
 
diff --git a/kubernetes/apps/ngnode/namespace.yaml b/kubernetes/apps/ngnode/namespace.yaml
deleted file mode 100644
index 88c994dbd..000000000
--- a/kubernetes/apps/ngnode/namespace.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: ngnode
-  labels:
-    kustomize.toolkit.fluxcd.io/prune: disabled
diff --git a/kubernetes/apps/observability/apprise/app/helmrelease.yaml b/kubernetes/apps/observability/apprise/app/helmrelease.yaml
index 3190f7876..230bb0432 100644
--- a/kubernetes/apps/observability/apprise/app/helmrelease.yaml
+++ b/kubernetes/apps/observability/apprise/app/helmrelease.yaml
@@ -46,8 +46,6 @@ spec:
       app:
         enabled: true
         className: internal
-        annotations:
-          hajimari.io/icon: bell-cog
         hosts:
           - host: &host "{{ .Release.Name }}.${SECRET_EXTERNAL_DOMAIN}"
             paths:
diff --git a/kubernetes/apps/observability/gatus/app/helmrelease.yaml b/kubernetes/apps/observability/gatus/app/helmrelease.yaml
index 644202cdb..5635dcf28 100644
--- a/kubernetes/apps/observability/gatus/app/helmrelease.yaml
+++ b/kubernetes/apps/observability/gatus/app/helmrelease.yaml
@@ -97,7 +97,6 @@ spec:
       app:
         className: external
         annotations:
-          hajimari.io/icon: mdi:list-status
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Gatus
           gethomepage.dev/description: Automated developer-oriented status page.
diff --git a/kubernetes/apps/observability/grafana/app/helmrelease.yaml b/kubernetes/apps/observability/grafana/app/helmrelease.yaml
index a7f45ea6e..41fc59778 100644
--- a/kubernetes/apps/observability/grafana/app/helmrelease.yaml
+++ b/kubernetes/apps/observability/grafana/app/helmrelease.yaml
@@ -1,28 +1,35 @@
 ---
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/ocirepository_v1.json
+apiVersion: source.toolkit.fluxcd.io/v1
+kind: OCIRepository
+metadata:
+  name: grafana
+spec:
+  interval: 5m
+  layerSelector:
+    mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip
+    operation: copy
+  ref:
+    tag: 9.2.7
+  url: oci://ghcr.io/grafana/helm-charts/grafana
+---
 # yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/helm.toolkit.fluxcd.io/helmrelease_v2.json
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
   name: grafana
 spec:
-  interval: 30m
-  chart:
-    spec:
-      chart: grafana
-      version: 9.2.2
-      sourceRef:
-        kind: HelmRepository
-        name: grafana
-        namespace: flux-system
+  interval: 1h
+  chartRef:
+    kind: OCIRepository
+    name: grafana
   install:
     remediation:
-      retries: 3
+      retries: -1
   upgrade:
     cleanupOnFail: true
     remediation:
       retries: 3
-  uninstall:
-    keepHistory: false
   values:
     annotations:
       reloader.stakater.com/auto: "true"
@@ -326,7 +333,6 @@ spec:
       enabled: true
       ingressClassName: internal
       annotations:
-        hajimari.io/icon: simple-icons:grafana
         gethomepage.dev/enabled: "true"
         gethomepage.dev/name: Grafana
         gethomepage.dev/description: Observability and data visualization platform.
diff --git a/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml b/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml
index 3afcde588..ff5eb1e3f 100644
--- a/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml
+++ b/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml
@@ -116,8 +116,6 @@ spec:
           nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
           nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
           nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/appName: Prometheus
-          hajimari.io/icon: simple-icons:prometheus
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Prometheus
           gethomepage.dev/description: Systems and service monitoring system.
@@ -230,8 +228,6 @@ spec:
           nginx.ingress.kubernetes.io/auth-signin: https://auth.${SECRET_EXTERNAL_DOMAIN}?rm=$request_method
           nginx.ingress.kubernetes.io/auth-response-headers: Remote-User,Remote-Name,Remote-Groups,Remote-Email
           nginx.ingress.kubernetes.io/auth-snippet: proxy_set_header X-Forwarded-Method $request_method;
-          hajimari.io/appName: Alert Manager
-          hajimari.io/icon: mdi:alert-decagram-outline
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Alert-Manager
           gethomepage.dev/description: Handles alerts sent by Prometheus.
diff --git a/kubernetes/apps/observability/scrutiny/app/helmrelease.yaml b/kubernetes/apps/observability/scrutiny/app/helmrelease.yaml
index e79f1c114..a1189fb40 100644
--- a/kubernetes/apps/observability/scrutiny/app/helmrelease.yaml
+++ b/kubernetes/apps/observability/scrutiny/app/helmrelease.yaml
@@ -52,7 +52,6 @@ spec:
         enabled: true
         className: internal
         annotations:
-          hajimari.io/icon: mdi:harddiskstatus
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Scrutiny
           gethomepage.dev/description: Hard Drive S.M.A.R.T Monitoring.
diff --git a/kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml b/kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml
index 9162d853c..b06fb7a94 100644
--- a/kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml
+++ b/kubernetes/apps/rook-ceph/rook-ceph/cluster/helmrelease.yaml
@@ -38,8 +38,6 @@ spec:
       dashboard:
         ingressClassName: internal
         annotations:
-          hajimari.io/appName: Rook
-          hajimari.io/icon: mdi:chess-rook
           gethomepage.dev/enabled: "true"
           gethomepage.dev/name: Rook
           gethomepage.dev/description: Cloud-Native Storage for Kubernetes.