diff --git a/apps/base/findmydevice/kustomization.yaml b/apps/base/findmydevice/kustomization.yaml
index 6d27f7d894bb5c34839ca58abfb24fb33000e082..3a52936b8e04a1a5eead0ef1d7f563144ca85a32 100644
--- a/apps/base/findmydevice/kustomization.yaml
+++ b/apps/base/findmydevice/kustomization.yaml
@@ -1,11 +1,20 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: findmydevice
+
+commonLabels:
+  app.kubernetes.io/name: findmydevice
+
+buildMetadata:
+  - originAnnotations
+
 resources:
   - namespace.yaml
   - release.yaml
   - ../../../shared/networkpolicies/allow-from-same-namespace.yaml
   - ../../../shared/networkpolicies/allow-from-ingress.yaml
   - ../../../shared/networkpolicies/allow-from-monitoring.yaml
-patchesStrategicMerge:
-  - networkpolicy.yaml
+
+components:
+  - ../../../shared/components/flux-namespace-admin
+  - ../../../shared/components/namespace-baseline
diff --git a/apps/base/findmydevice/namespace.yaml b/apps/base/findmydevice/namespace.yaml
index 0ccfe62ed23fab33485ef74f0725be4c867531b9..b4df4036f951eca863ec87f8aafde62b6d5c28cc 100644
--- a/apps/base/findmydevice/namespace.yaml
+++ b/apps/base/findmydevice/namespace.yaml
@@ -2,30 +2,3 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: findmydevice
-  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: findmydevice
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: flux-reconciler
-  namespace: findmydevice
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: admin
-subjects:
-  - kind: ServiceAccount
-    name: flux-reconciler
-    namespace: findmydevice
diff --git a/apps/base/findmydevice/networkpolicy.yaml b/apps/base/findmydevice/networkpolicy.yaml
deleted file mode 100644
index abebf0d7ccd172c1404dc98bba6f725cbe6743f6..0000000000000000000000000000000000000000
--- a/apps/base/findmydevice/networkpolicy.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  name: allow-from-ingress
-spec:
-  podSelector:
-    matchLabels:
-      app.kubernetes.io/name: findmydevice
----
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  name: allow-from-monitoring
-spec:
-  podSelector:
-    matchLabels:
-      app.kubernetes.io/name: findmydevice
diff --git a/apps/base/findmydevice/release.yaml b/apps/base/findmydevice/release.yaml
index 802be0cf774e923dcbce3babbc0b318bdff9e9bf..09bf1f42ecf1e243293bbadd9ffb7b41b896e577 100644
--- a/apps/base/findmydevice/release.yaml
+++ b/apps/base/findmydevice/release.yaml
@@ -4,7 +4,6 @@ metadata:
   name: findmydevice
   namespace: findmydevice
 spec:
-  serviceAccountName: flux-reconciler
   timeout: 15m
   releaseName: fmd
   chart:
diff --git a/apps/k8s01/findmydevice/kustomization.yaml b/apps/k8s01/findmydevice/kustomization.yaml
index 098f30fbd56f1abd8107c18c0174ec67a6791d7a..2cce610d46038b19f7e79dbf5bb1431e2a5fe5a6 100644
--- a/apps/k8s01/findmydevice/kustomization.yaml
+++ b/apps/k8s01/findmydevice/kustomization.yaml
@@ -1,6 +1,11 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: findmydevice
+
+commonLabels:
+  app.kubernetes.io/name: findmydevice
+  app.kubernetes.io/instance: findmydevice
+
 resources:
   - ../../base/findmydevice
   - certificate.yaml