diff --git a/charts/fp/templates/link2cid.yaml b/charts/fp/templates/link2cid.yaml
index 63d744f..b60632e 100644
--- a/charts/fp/templates/link2cid.yaml
+++ b/charts/fp/templates/link2cid.yaml
@@ -101,6 +101,4 @@ spec:
             name: link2cid
             port:
               number: 80
-
-
 {{ end }}
diff --git a/infrastructure/controllers/cert-manager.yaml b/infrastructure/controllers/cert-manager.yaml
index 8b26a32..29730d8 100644
--- a/infrastructure/controllers/cert-manager.yaml
+++ b/infrastructure/controllers/cert-manager.yaml
@@ -3,8 +3,6 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: cert-manager
-  labels:
-    toolkit.fluxcd.io/tenant: sre-team
 ---
 apiVersion: source.toolkit.fluxcd.io/v1beta2
 kind: HelmRepository
diff --git a/infrastructure/controllers/external-dns.yaml b/infrastructure/controllers/external-dns.yaml
index ec5e49f..5bff065 100644
--- a/infrastructure/controllers/external-dns.yaml
+++ b/infrastructure/controllers/external-dns.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: external-dns
-  namespace: default
+  namespace: futureporn
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -31,13 +31,13 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: external-dns
-  namespace: default
+  namespace: futureporn
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: external-dns
-  namespace: default
+  namespace: futureporn
 spec:
   strategy:
     type: Recreate
diff --git a/infrastructure/controllers/ingress-nginx.yaml b/infrastructure/controllers/ingress-nginx.yaml
index 5ab5a60..8e5c4f5 100644
--- a/infrastructure/controllers/ingress-nginx.yaml
+++ b/infrastructure/controllers/ingress-nginx.yaml
@@ -10,7 +10,7 @@ apiVersion: source.toolkit.fluxcd.io/v1beta2
 kind: HelmRepository
 metadata:
   name: ingress-nginx
-  namespace: ingress-nginx
+  namespace: futureporn
 spec:
   interval: 24h
   url: https://kubernetes.github.io/ingress-nginx
@@ -19,7 +19,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta2
 kind: HelmRelease
 metadata:
   name: ingress-nginx
-  namespace: ingress-nginx
+  namespace: futureporn
 spec:
   interval: 30m
   chart:
@@ -29,7 +29,7 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: ingress-nginx
-        namespace: ingress-nginx
+        namespace: futureporn
       interval: 12h
   values:
     controller: