diff --git a/apps/arr/lidarr/service.yaml b/apps/arr/lidarr/service.yaml
index e61cff2..f387be6 100644
--- a/apps/arr/lidarr/service.yaml
+++ b/apps/arr/lidarr/service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: lidarr
 spec:
-  type: LoadBalancer
+  type: ClusterIP
   ports:
     - name: web
       port: 8686
diff --git a/apps/arr/prowlarr/service.yaml b/apps/arr/prowlarr/service.yaml
index 355290c..dfd5e30 100644
--- a/apps/arr/prowlarr/service.yaml
+++ b/apps/arr/prowlarr/service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: prowlarr
 spec:
-  type: LoadBalancer
+  type: ClusterIP
   ports:
     - name: web
       port: 9696
diff --git a/apps/arr/radarr/service.yaml b/apps/arr/radarr/service.yaml
index 7510cb5..ecdece5 100644
--- a/apps/arr/radarr/service.yaml
+++ b/apps/arr/radarr/service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: radarr
 spec:
-  type: LoadBalancer
+  type: ClusterIP
   ports:
     - name: web
       port: 7878
diff --git a/apps/arr/sonarr/service.yaml b/apps/arr/sonarr/service.yaml
index f288e59..ab4fee6 100644
--- a/apps/arr/sonarr/service.yaml
+++ b/apps/arr/sonarr/service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: sonarr
 spec:
-  type: LoadBalancer
+  type: ClusterIP
   ports:
     - name: web
       port: 8989
diff --git a/apps/home-assistant/home-assistant/deployment.yaml b/apps/home-assistant/deployment.yaml
similarity index 100%
rename from apps/home-assistant/home-assistant/deployment.yaml
rename to apps/home-assistant/deployment.yaml
diff --git a/apps/home-assistant/home-assistant/kustomization.yaml b/apps/home-assistant/home-assistant/kustomization.yaml
deleted file mode 100644
index c227f1f..0000000
--- a/apps/home-assistant/home-assistant/kustomization.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-commonLabels:
-  app: home-assistant
-
-resources:
-  - service.yaml
-  - deployment.yaml
diff --git a/apps/home-assistant/home-assistant/namespace.yaml b/apps/home-assistant/home-assistant/namespace.yaml
deleted file mode 100644
index 93acd9a..0000000
--- a/apps/home-assistant/home-assistant/namespace.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: home-assistant
\ No newline at end of file
diff --git a/apps/home-assistant/ingress.yaml b/apps/home-assistant/ingress.yaml
index c07fb1a..e1ee4b2 100644
--- a/apps/home-assistant/ingress.yaml
+++ b/apps/home-assistant/ingress.yaml
@@ -6,19 +6,10 @@ spec:
   entryPoints:
     - websecure
   routes:
-    - match: Host(`auth-hass.stonegarden.dev`)
-      kind: Rule
-      services:
-        - name: traefik-forward-auth
-          port: 4181
-      middlewares:
-        - name: traefik-forward-auth
     - match: Host(`hass.stonegarden.dev`)
       kind: Rule
       services:
         - name: home-assistant
           port: 8123
-      middlewares:
-        - name: traefik-forward-auth
   tls:
     certResolver: letsencrypt
\ No newline at end of file
diff --git a/apps/home-assistant/kustomization.yaml b/apps/home-assistant/kustomization.yaml
index bced2a3..2c39c14 100644
--- a/apps/home-assistant/kustomization.yaml
+++ b/apps/home-assistant/kustomization.yaml
@@ -1,9 +1,11 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: home-assistant
+commonLabels:
+  app: home-assistant
 
 resources:
   - namespace.yaml
+  - service.yaml
+  - deployment.yaml
   - ingress.yaml
-  - traefik-forward-auth
-  - home-assistant
diff --git a/apps/home-assistant/home-assistant/service.yaml b/apps/home-assistant/service.yaml
similarity index 87%
rename from apps/home-assistant/home-assistant/service.yaml
rename to apps/home-assistant/service.yaml
index b44aa3c..56f9f1a 100644
--- a/apps/home-assistant/home-assistant/service.yaml
+++ b/apps/home-assistant/service.yaml
@@ -3,6 +3,7 @@ kind: Service
 metadata:
   name: home-assistant
 spec:
+  type: LoadBalancer
   ports:
     - name: web
       port: 8123
diff --git a/apps/home-assistant/traefik-forward-auth/configs/traefik-forward-auth.ini b/apps/home-assistant/traefik-forward-auth/configs/traefik-forward-auth.ini
deleted file mode 100644
index 810d31f..0000000
--- a/apps/home-assistant/traefik-forward-auth/configs/traefik-forward-auth.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-cookie-name = "_hass_auth"
-log-level = "error"
-cookie-domain = "stonegarden.dev"
-auth-host = "auth-hass.stonegarden.dev"
-whitelist = "veghag@gmail.com, nina.m.smorsgard@gmail.com"
\ No newline at end of file
diff --git a/apps/home-assistant/traefik-forward-auth/deployment.yaml b/apps/home-assistant/traefik-forward-auth/deployment.yaml
deleted file mode 100644
index e7d4e20..0000000
--- a/apps/home-assistant/traefik-forward-auth/deployment.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: traefik-forward-auth
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: traefik-forward-auth
-  strategy:
-    type: Recreate
-  template:
-    spec:
-      terminationGracePeriodSeconds: 60
-      containers:
-        - image: thomseddon/traefik-forward-auth:2
-          name: traefik-forward-auth
-          ports:
-            - containerPort: 4181
-              protocol: TCP
-          env:
-            - name: CONFIG
-              value: "/config"
-            - name: PROVIDERS_GOOGLE_CLIENT_ID
-              valueFrom:
-                secretKeyRef:
-                  name: traefik-forward-auth-secrets
-                  key: google-client-id
-            - name: PROVIDERS_GOOGLE_CLIENT_SECRET
-              valueFrom:
-                secretKeyRef:
-                  name: traefik-forward-auth-secrets
-                  key: google-client-secret
-            - name: SECRET
-              valueFrom:
-                secretKeyRef:
-                  name: traefik-forward-auth-secrets
-                  key: secret
-          volumeMounts:
-            - name: configs
-              mountPath: /config
-              subPath: traefik-forward-auth.ini
-
-      volumes:
-        - name: configs
-          configMap:
-            name: configs
-        - name: traefik-forward-auth-secrets
-          secret:
-            secretName: traefik-forward-auth-secrets
\ No newline at end of file
diff --git a/apps/home-assistant/traefik-forward-auth/kustomization.yaml b/apps/home-assistant/traefik-forward-auth/kustomization.yaml
deleted file mode 100644
index b8c391f..0000000
--- a/apps/home-assistant/traefik-forward-auth/kustomization.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-commonLabels:
-  app: traefik-forward-auth
-
-resources:
-  - service.yaml
-  - deployment.yaml
-  - middleware.yaml
-
-configMapGenerator:
-  - name: configs
-    files:
-      - configs/traefik-forward-auth.ini
-
-secretGenerator:
-  - name: traefik-forward-auth-secrets
-    envs:
-      - secrets/traefik-forward-auth.env
\ No newline at end of file
diff --git a/apps/home-assistant/traefik-forward-auth/middleware.yaml b/apps/home-assistant/traefik-forward-auth/middleware.yaml
deleted file mode 100644
index 1e5fc60..0000000
--- a/apps/home-assistant/traefik-forward-auth/middleware.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: traefik.containo.us/v1alpha1
-kind: Middleware
-metadata:
-  name: traefik-forward-auth
-spec:
-  forwardAuth:
-    address: http://traefik-forward-auth.home-assistant.svc.cluster.local:4181
-    authResponseHeaders:
-      - X-Forwarded-User
-    trustForwardHeader: true
\ No newline at end of file
diff --git a/apps/home-assistant/traefik-forward-auth/service.yaml b/apps/home-assistant/traefik-forward-auth/service.yaml
deleted file mode 100644
index 569ceff..0000000
--- a/apps/home-assistant/traefik-forward-auth/service.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: traefik-forward-auth
-spec:
-  type: ClusterIP
-  selector:
-    app: traefik-forward-auth
-  ports:
-    - name: auth-http
-      port: 4181
diff --git a/apps/whoami/traefik-forward-auth/service.yaml b/apps/whoami/traefik-forward-auth/service.yaml
index 18dc8ea..6d92888 100644
--- a/apps/whoami/traefik-forward-auth/service.yaml
+++ b/apps/whoami/traefik-forward-auth/service.yaml
@@ -1,6 +1,3 @@
-#
-# Auth Service
-#
 apiVersion: v1
 kind: Service
 metadata: