diff --git a/apps/base/iot/kustomization.yaml b/apps/base/iot/kustomization.yaml
index 0126547228bb84fb9d8c92e8f693db62cbb930d9..17695acfe84724799821628c31615c02531357dc 100644
--- a/apps/base/iot/kustomization.yaml
+++ b/apps/base/iot/kustomization.yaml
@@ -6,8 +6,8 @@ resources:
 - shelly-exporter.yaml
 - shelly-ht-monitor.yaml
 - ../../../shared/networkpolicies/allow-from-monitoring.yaml
-patchesStrategicMerge:
-  - networkpolicy.yaml
+patches:
+  - path: networkpolicy.yaml
 configMapGenerator:
   - name: iot-grafana-dashboards
     files:
@@ -15,3 +15,7 @@ configMapGenerator:
     options:
       labels:
         grafana_dashboard: iot
+
+components:
+  - ../../../shared/components/flux-namespace-admin
+  - ../../../shared/components/namespace-baseline
\ No newline at end of file
diff --git a/apps/base/iot/namespace.yaml b/apps/base/iot/namespace.yaml
index c22a70136270959881e38cf8f554bc7731030407..90e21cab723b127404e250dbf06821719a46bce9 100644
--- a/apps/base/iot/namespace.yaml
+++ b/apps/base/iot/namespace.yaml
@@ -2,30 +2,4 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: iot
-  labels:
-    pod-security.kubernetes.io/audit: restricted
-    pod-security.kubernetes.io/enforce: baseline
-    pod-security.kubernetes.io/warn: restricted
-    pod-security.kubernetes.io/audit-version: v1.26
-    pod-security.kubernetes.io/enforce-version: v1.23
-    pod-security.kubernetes.io/warn-version: v1.26
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: flux-reconciler
-  namespace: iot
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: flux-reconciler
-  namespace: iot
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: admin
-subjects:
-  - kind: ServiceAccount
-    name: flux-reconciler
-    namespace: iot
+  labels: {}
diff --git a/apps/base/iot/shelly-exporter.yaml b/apps/base/iot/shelly-exporter.yaml
index 287c66443298daa9fcfd98813b344f29b088f20c..dd5becc78fab690c2e2b01932e681a260f648bcb 100644
--- a/apps/base/iot/shelly-exporter.yaml
+++ b/apps/base/iot/shelly-exporter.yaml
@@ -4,7 +4,6 @@ metadata:
   name: shelly-exporter
   namespace: iot
 spec:
-  serviceAccountName: flux-reconciler
   releaseName: shelly-exporter
   chart:
     spec:
diff --git a/apps/k8s01/iot/kustomization.yaml b/apps/k8s01/iot/kustomization.yaml
index f712fc87f080100a26adf930294a52780247ae20..c9f20ea9a546295f9a1eb727dd7f474ebcd3cdc0 100644
--- a/apps/k8s01/iot/kustomization.yaml
+++ b/apps/k8s01/iot/kustomization.yaml
@@ -4,9 +4,11 @@ namespace: iot
 resources:
 - ../../base/iot
 - certificate.yaml
-- ../../../shared/applications/oauth2-proxy.yaml
 - oauth2.yaml
 - rainer.yaml
 - shelly.yaml
 - shelly-ht-monitor.yaml
 - monitoring.yaml
+
+components:
+ - ../../../shared/components/oauth2-proxy