diff --git a/infrastructure/gitea-runner/helmrelease.yaml b/apps/gitea-runner/helmrelease.yaml
similarity index 100%
rename from infrastructure/gitea-runner/helmrelease.yaml
rename to apps/gitea-runner/helmrelease.yaml
diff --git a/infrastructure/gitea-runner/helmrepository.yaml b/apps/gitea-runner/helmrepository.yaml
similarity index 100%
rename from infrastructure/gitea-runner/helmrepository.yaml
rename to apps/gitea-runner/helmrepository.yaml
diff --git a/infrastructure/gitea-runner/kustomization.yaml b/apps/gitea-runner/kustomization.yaml
similarity index 100%
rename from infrastructure/gitea-runner/kustomization.yaml
rename to apps/gitea-runner/kustomization.yaml
diff --git a/infrastructure/gitea-runner/namespace.yaml b/apps/gitea-runner/namespace.yaml
similarity index 100%
rename from infrastructure/gitea-runner/namespace.yaml
rename to apps/gitea-runner/namespace.yaml
diff --git a/infrastructure/gitea/helmrelease.yaml b/apps/gitea/helmrelease.yaml
similarity index 93%
rename from infrastructure/gitea/helmrelease.yaml
rename to apps/gitea/helmrelease.yaml
index 4bf68a5..0d88de7 100644
--- a/infrastructure/gitea/helmrelease.yaml
+++ b/apps/gitea/helmrelease.yaml
@@ -17,7 +17,7 @@ spec:
   values:
     persistence:
       enabled: true
-      storageClass: longhorn
+      storageClass: local-path
       size: 5Gi
     ingress:
       enabled: true
@@ -55,6 +55,8 @@ spec:
         tag: 25.0.2-dind
         pullPolicy: IfNotPresent
     config:
+      server:
+        ROOT_URL: "http://gitea.local/"
       actions:
         ENABLED: true
       metrics:
diff --git a/infrastructure/gitea/helmrepository.yaml b/apps/gitea/helmrepository.yaml
similarity index 100%
rename from infrastructure/gitea/helmrepository.yaml
rename to apps/gitea/helmrepository.yaml
diff --git a/infrastructure/gitea/kustomization.yaml b/apps/gitea/kustomization.yaml
similarity index 100%
rename from infrastructure/gitea/kustomization.yaml
rename to apps/gitea/kustomization.yaml
diff --git a/infrastructure/gitea/namespace.yaml b/apps/gitea/namespace.yaml
similarity index 100%
rename from infrastructure/gitea/namespace.yaml
rename to apps/gitea/namespace.yaml
diff --git a/apps/home-assitant/helmrelease.yaml b/apps/home-assitant/helmrelease.yaml
new file mode 100644
index 0000000..731d18a
--- /dev/null
+++ b/apps/home-assitant/helmrelease.yaml
@@ -0,0 +1,49 @@
+apiVersion: helm.toolkit.fluxcd.io/v2beta2
+kind: HelmRelease
+metadata:
+  name: home-assistant
+  namespace: home-assistant
+spec:
+  interval: 5m
+  releaseName: home-assistant
+  chart:
+    spec:
+      chart: home-assistant
+      version: "0.3.2"
+      # version: "1.2.0"
+      sourceRef:
+        kind: HelmRepository
+        name: home-assistant
+        namespace: flux-system
+  values:
+    hostNetwork: false
+    # hostPort:
+    #   enabled: true
+    #   port: 8123
+    service:
+      type: ClusterIP
+      port: 8123
+    ingress:
+      enabled: true
+      className: traefik
+      hosts:
+        - host: home-assistant.local
+          paths:
+            - path: /
+              pathType: Prefix
+    persistence:
+      enabled: true
+      storageClass: local-path
+      size: 5Gi
+    configuration:
+      enabled: true
+      trusted_proxies:
+        - "10.0.0.0/8"
+        - "10.42.0.0/16"
+        - "172.16.0.0/12"
+        - "192.168.0.0/16"
+        - "::1"
+        - "127.0.0.1"
+        - "172.23.0.0/16"
+      use_x_forwarded_for: true
+      
diff --git a/apps/home-assitant/helmrepository.yaml b/apps/home-assitant/helmrepository.yaml
new file mode 100644
index 0000000..4fa07e3
--- /dev/null
+++ b/apps/home-assitant/helmrepository.yaml
@@ -0,0 +1,9 @@
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: HelmRepository
+metadata:
+  name: home-assistant
+  namespace: flux-system
+spec:
+  interval: 1h0m0s
+  url: http://pajikos.github.io/home-assistant-helm-chart
+  # url: https://charts.alekc.dev
diff --git a/infrastructure/sonarqube/kustomization.yaml b/apps/home-assitant/kustomization.yaml
similarity index 100%
rename from infrastructure/sonarqube/kustomization.yaml
rename to apps/home-assitant/kustomization.yaml
diff --git a/apps/home-assitant/namespace.yaml b/apps/home-assitant/namespace.yaml
new file mode 100644
index 0000000..7c1d06d
--- /dev/null
+++ b/apps/home-assitant/namespace.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: home-assistant
diff --git a/apps/kustomization.yaml b/apps/kustomization.yaml
new file mode 100644
index 0000000..4881868
--- /dev/null
+++ b/apps/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - gitea/
+  - home-assitant/
+  # - sonarqube/
diff --git a/infrastructure/sonarqube/helmrelease.yaml b/apps/sonarqube/helmrelease.yaml
similarity index 100%
rename from infrastructure/sonarqube/helmrelease.yaml
rename to apps/sonarqube/helmrelease.yaml
diff --git a/infrastructure/sonarqube/helmrepository.yaml b/apps/sonarqube/helmrepository.yaml
similarity index 100%
rename from infrastructure/sonarqube/helmrepository.yaml
rename to apps/sonarqube/helmrepository.yaml
diff --git a/apps/sonarqube/kustomization.yaml b/apps/sonarqube/kustomization.yaml
new file mode 100644
index 0000000..b4a3d7c
--- /dev/null
+++ b/apps/sonarqube/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - namespace.yaml
+  - helmrepository.yaml
+  - helmrelease.yaml
diff --git a/infrastructure/sonarqube/namespace.yaml b/apps/sonarqube/namespace.yaml
similarity index 100%
rename from infrastructure/sonarqube/namespace.yaml
rename to apps/sonarqube/namespace.yaml
diff --git a/clusters/production/flux-system/gotk-sync.yaml b/clusters/production/flux-system/gotk-sync.yaml
index 6f4c2dc..73ee98f 100644
--- a/clusters/production/flux-system/gotk-sync.yaml
+++ b/clusters/production/flux-system/gotk-sync.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   interval: 1m0s
   ref:
-    branch: main
+    branch: k3d
   secretRef:
     name: flux-system
   url: https://codeberg.org/Pata1704/homelab_gitops.git
diff --git a/clusters/production/kustomization.yaml b/clusters/production/kustomization.yaml
index b391401..7c02b60 100644
--- a/clusters/production/kustomization.yaml
+++ b/clusters/production/kustomization.yaml
@@ -2,3 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - ../../infrastructure
+  - ../../apps
diff --git a/infrastructure/kustomization.yaml b/infrastructure/kustomization.yaml
index 620a250..9688114 100644
--- a/infrastructure/kustomization.yaml
+++ b/infrastructure/kustomization.yaml
@@ -2,8 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - monitoring/
-  - longhorn/
-  - gitea/
-  # - gitea-runner/
-  # - sonarqube/
-  - cnpg
+  # - longhorn/
+  # - cnpg
diff --git a/infrastructure/monitoring/helmrelease.yaml b/infrastructure/monitoring/helmrelease.yaml
index f6d57f2..92b4889 100644
--- a/infrastructure/monitoring/helmrelease.yaml
+++ b/infrastructure/monitoring/helmrelease.yaml
@@ -19,5 +19,5 @@ spec:
   values:
     persistence:
       enabled: true
-      storageClass: longhorn
+      storageClass: local-path
       size: 5Gi
diff --git a/renovate.json b/renovate.json
deleted file mode 100644
index 7190a60..0000000
--- a/renovate.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
-}