diff --git a/secrets/custom-auth-authelia-configmap.yaml b/secrets/auth/authelia-configmap.yaml
similarity index 100%
rename from secrets/custom-auth-authelia-configmap.yaml
rename to secrets/auth/authelia-configmap.yaml
diff --git a/secrets/custom-auth-authelia-secrets.yaml b/secrets/auth/authelia-secrets.yaml
similarity index 100%
rename from secrets/custom-auth-authelia-secrets.yaml
rename to secrets/auth/authelia-secrets.yaml
diff --git a/secrets/helmrelease-data-bitwardenrs.yaml b/secrets/data/bitwardenrs.yaml
similarity index 100%
rename from secrets/helmrelease-data-bitwardenrs.yaml
rename to secrets/data/bitwardenrs.yaml
diff --git a/secrets/helmrelease-data-bookstack.yaml b/secrets/data/bookstack.yaml
similarity index 100%
rename from secrets/helmrelease-data-bookstack.yaml
rename to secrets/data/bookstack.yaml
diff --git a/secrets/helmrelease-data-freshrss.yaml b/secrets/data/freshrss.yaml
similarity index 100%
rename from secrets/helmrelease-data-freshrss.yaml
rename to secrets/data/freshrss.yaml
diff --git a/secrets/data-homelab-registry-credentials.yaml b/secrets/data/homelab-registry-credentials.yaml
similarity index 100%
rename from secrets/data-homelab-registry-credentials.yaml
rename to secrets/data/homelab-registry-credentials.yaml
diff --git a/secrets/data-homer-config.yaml b/secrets/data/homer-config.yaml
similarity index 100%
rename from secrets/data-homer-config.yaml
rename to secrets/data/homer-config.yaml
diff --git a/secrets/helmrelease-data-homer.yaml b/secrets/data/homer.yaml
similarity index 100%
rename from secrets/helmrelease-data-homer.yaml
rename to secrets/data/homer.yaml
diff --git a/secrets/helmrelease-data-recipes.yaml b/secrets/data/recipes.yaml
similarity index 100%
rename from secrets/helmrelease-data-recipes.yaml
rename to secrets/data/recipes.yaml
diff --git a/secrets/helmrelease-data-searx.yaml b/secrets/data/searx.yaml
similarity index 100%
rename from secrets/helmrelease-data-searx.yaml
rename to secrets/data/searx.yaml
diff --git a/secrets/helmrelease-data-sharry.yaml b/secrets/data/sharry.yaml
similarity index 100%
rename from secrets/helmrelease-data-sharry.yaml
rename to secrets/data/sharry.yaml
diff --git a/secrets/helmrelease-data-unifi.yaml b/secrets/data/unifi.yaml
similarity index 100%
rename from secrets/helmrelease-data-unifi.yaml
rename to secrets/data/unifi.yaml
diff --git a/secrets/helmrelease-data-vikunja.yaml b/secrets/data/vikunja.yaml
similarity index 100%
rename from secrets/helmrelease-data-vikunja.yaml
rename to secrets/data/vikunja.yaml
diff --git a/secrets/helmrelease-development-docker-registry.yaml b/secrets/development/docker-registry.yaml
similarity index 100%
rename from secrets/helmrelease-development-docker-registry.yaml
rename to secrets/development/docker-registry.yaml
diff --git a/secrets/development-drone-pipelines.yaml b/secrets/development/drone-pipelines.yaml
similarity index 100%
rename from secrets/development-drone-pipelines.yaml
rename to secrets/development/drone-pipelines.yaml
diff --git a/secrets/helmrelease-development-drone-runner-kube.yaml b/secrets/development/drone-runner-kube.yaml
similarity index 100%
rename from secrets/helmrelease-development-drone-runner-kube.yaml
rename to secrets/development/drone-runner-kube.yaml
diff --git a/secrets/helmrelease-development-drone.yaml b/secrets/development/drone.yaml
similarity index 100%
rename from secrets/helmrelease-development-drone.yaml
rename to secrets/development/drone.yaml
diff --git a/secrets/helmrelease-development-gitea.yaml b/secrets/development/gitea.yaml
similarity index 100%
rename from secrets/helmrelease-development-gitea.yaml
rename to secrets/development/gitea.yaml
diff --git a/secrets/helmrelease-development-drone-kubernetes-secrets.yaml b/secrets/development/kubernetes-secrets.yaml
similarity index 100%
rename from secrets/helmrelease-development-drone-kubernetes-secrets.yaml
rename to secrets/development/kubernetes-secrets.yaml
diff --git a/secrets/helmrelease-development-pgadmin.yaml b/secrets/development/pgadmin.yaml
similarity index 100%
rename from secrets/helmrelease-development-pgadmin.yaml
rename to secrets/development/pgadmin.yaml
diff --git a/secrets/helmrelease-home-hass.yaml b/secrets/home/hass.yaml
similarity index 100%
rename from secrets/helmrelease-home-hass.yaml
rename to secrets/home/hass.yaml
diff --git a/secrets/helmrelease-longhorn-system-longhorn.yaml b/secrets/longhorn-system/longhorn.yaml
similarity index 100%
rename from secrets/helmrelease-longhorn-system-longhorn.yaml
rename to secrets/longhorn-system/longhorn.yaml
diff --git a/secrets/longhorn-system-minio-truenas-credentials.yaml b/secrets/longhorn-system/minio-truenas-credentials.yaml
similarity index 100%
rename from secrets/longhorn-system-minio-truenas-credentials.yaml
rename to secrets/longhorn-system/minio-truenas-credentials.yaml
diff --git a/secrets/helmrelease-media-bazarr.yaml b/secrets/media/bazarr.yaml
similarity index 100%
rename from secrets/helmrelease-media-bazarr.yaml
rename to secrets/media/bazarr.yaml
diff --git a/secrets/helmrelease-media-flood.yaml b/secrets/media/flood.yaml
similarity index 100%
rename from secrets/helmrelease-media-flood.yaml
rename to secrets/media/flood.yaml
diff --git a/secrets/helmrelease-media-jackett.yaml b/secrets/media/jackett.yaml
similarity index 100%
rename from secrets/helmrelease-media-jackett.yaml
rename to secrets/media/jackett.yaml
diff --git a/secrets/helmrelease-media-jellyfin.yaml b/secrets/media/jellyfin.yaml
similarity index 100%
rename from secrets/helmrelease-media-jellyfin.yaml
rename to secrets/media/jellyfin.yaml
diff --git a/secrets/helmrelease-media-lidarr.yaml b/secrets/media/lidarr.yaml
similarity index 100%
rename from secrets/helmrelease-media-lidarr.yaml
rename to secrets/media/lidarr.yaml
diff --git a/secrets/helmrelease-media-lychee.yaml b/secrets/media/lychee.yaml
similarity index 100%
rename from secrets/helmrelease-media-lychee.yaml
rename to secrets/media/lychee.yaml
diff --git a/secrets/helmrelease-media-navidrome.yaml b/secrets/media/navidrome.yaml
similarity index 100%
rename from secrets/helmrelease-media-navidrome.yaml
rename to secrets/media/navidrome.yaml
diff --git a/secrets/helmrelease-media-pyload.yaml b/secrets/media/pyload.yaml
similarity index 100%
rename from secrets/helmrelease-media-pyload.yaml
rename to secrets/media/pyload.yaml
diff --git a/secrets/helmrelease-media-qbittorrent.yaml b/secrets/media/qbittorrent.yaml
similarity index 100%
rename from secrets/helmrelease-media-qbittorrent.yaml
rename to secrets/media/qbittorrent.yaml
diff --git a/secrets/helmrelease-media-radarr.yaml b/secrets/media/radarr.yaml
similarity index 100%
rename from secrets/helmrelease-media-radarr.yaml
rename to secrets/media/radarr.yaml
diff --git a/secrets/helmrelease-media-sonarr.yaml b/secrets/media/sonarr.yaml
similarity index 100%
rename from secrets/helmrelease-media-sonarr.yaml
rename to secrets/media/sonarr.yaml
diff --git a/secrets/helmrelease-monitoring-blackbox-exporter.yaml b/secrets/monitoring/blackbox-exporter.yaml
similarity index 100%
rename from secrets/helmrelease-monitoring-blackbox-exporter.yaml
rename to secrets/monitoring/blackbox-exporter.yaml
diff --git a/secrets/helmrelease-monitoring-botkube.yaml b/secrets/monitoring/botkube.yaml
similarity index 100%
rename from secrets/helmrelease-monitoring-botkube.yaml
rename to secrets/monitoring/botkube.yaml
diff --git a/secrets/helmrelease-monitoring-goldilocks.yaml b/secrets/monitoring/goldilocks.yaml
similarity index 100%
rename from secrets/helmrelease-monitoring-goldilocks.yaml
rename to secrets/monitoring/goldilocks.yaml
diff --git a/secrets/helmrelease-monitoring-healthchecks.yaml b/secrets/monitoring/healthchecks.yaml
similarity index 100%
rename from secrets/helmrelease-monitoring-healthchecks.yaml
rename to secrets/monitoring/healthchecks.yaml
diff --git a/secrets/helmrelease-monitoring-kubernetes-dashboard.yaml b/secrets/monitoring/kubernetes-dashboard.yaml
similarity index 100%
rename from secrets/helmrelease-monitoring-kubernetes-dashboard.yaml
rename to secrets/monitoring/kubernetes-dashboard.yaml
diff --git a/secrets/helmrelease-monitoring-loki-stack.yaml b/secrets/monitoring/loki-stack.yaml
similarity index 100%
rename from secrets/helmrelease-monitoring-loki-stack.yaml
rename to secrets/monitoring/loki-stack.yaml
diff --git a/secrets/helmrelease-monitoring-prometheus-stack.yaml b/secrets/monitoring/prometheus-stack.yaml
similarity index 100%
rename from secrets/helmrelease-monitoring-prometheus-stack.yaml
rename to secrets/monitoring/prometheus-stack.yaml
diff --git a/secrets/helmrelease-monitoring-thanos.yaml b/secrets/monitoring/thanos.yaml
similarity index 100%
rename from secrets/helmrelease-monitoring-thanos.yaml
rename to secrets/monitoring/thanos.yaml