diff --git a/apps/base/forecastle/namespace.yaml b/apps/base/forecastle/namespace.yaml
index 696c5807cd84b46e42208f78c8950e6fc216ae9b..b7c41132d84a7d021acb4a7cffb0b7ebfc26bffe 100644
--- a/apps/base/forecastle/namespace.yaml
+++ b/apps/base/forecastle/namespace.yaml
@@ -13,13 +13,13 @@ metadata:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: forecastle-reconciler
+  name: flux-reconciler
   namespace: forecastle
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: forecastle-reconciler
+  name: flux-reconciler
   namespace: forecastle
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -27,5 +27,5 @@ roleRef:
   name: admin
 subjects:
   - kind: ServiceAccount
-    name: forecastle-reconciler
+    name: flux-reconciler
     namespace: forecastle
diff --git a/apps/base/gitlab-runner/namespace.yaml b/apps/base/gitlab-runner/namespace.yaml
index 17914e5da21b5b7aa192288fb431776291fb8e99..a0ad4cacd7b18d7becf07bdea3603fcffcdfd89a 100644
--- a/apps/base/gitlab-runner/namespace.yaml
+++ b/apps/base/gitlab-runner/namespace.yaml
@@ -8,13 +8,13 @@ metadata:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: gitlab-runner-reconciler
+  name: flux-reconciler
   namespace: gitlab-runner
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: gitlab-runner-reconciler
+  name: flux-reconciler
   namespace: gitlab-runner
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -22,5 +22,5 @@ roleRef:
   name: admin
 subjects:
   - kind: ServiceAccount
-    name: gitlab-runner-reconciler
+    name: flux-reconciler
     namespace: gitlab-runner
diff --git a/apps/base/gitlab-runner/release.yaml b/apps/base/gitlab-runner/release.yaml
index bff2559971522c9a5055c6553fc48fd08e34b657..58873e29b73ed0e6406c646a4efb02777dc9251d 100644
--- a/apps/base/gitlab-runner/release.yaml
+++ b/apps/base/gitlab-runner/release.yaml
@@ -4,7 +4,7 @@ metadata:
   name: gitlab-runner
   namespace: gitlab-runner
 spec:
-  serviceAccountName: gitlab-runner-reconciler
+  serviceAccountName: flux-reconciler
   timeout: 15m
   releaseName: gitlab-runner
   chart:
diff --git a/apps/base/keycloak/namespace.yaml b/apps/base/keycloak/namespace.yaml
index 1384e40e4c269fca9ad69cd0f489967884cc3936..cd23ac328baee49ea8ca102513754e8ad054dd97 100644
--- a/apps/base/keycloak/namespace.yaml
+++ b/apps/base/keycloak/namespace.yaml
@@ -6,13 +6,13 @@ metadata:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: keycloak-reconciler
+  name: flux-reconciler
   namespace: keycloak
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: keycloak-reconciler
+  name: flux-reconciler
   namespace: keycloak
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -20,5 +20,5 @@ roleRef:
   name: admin
 subjects:
   - kind: ServiceAccount
-    name: keycloak-reconciler
+    name: flux-reconciler
     namespace: keycloak
diff --git a/apps/base/keycloak/release.yaml b/apps/base/keycloak/release.yaml
index 47dde86824928a41ae14bb0b0fd3491249e301fd..4a587dc1c5811bf3a24defe350b46cf484fc0d75 100644
--- a/apps/base/keycloak/release.yaml
+++ b/apps/base/keycloak/release.yaml
@@ -4,7 +4,7 @@ metadata:
   name: keycloak
   namespace: keycloak
 spec:
-  serviceAccountName: keycloak-reconciler
+  serviceAccountName: flux-reconciler
   releaseName: keycloak
   chart:
     spec:
diff --git a/apps/base/matrix/namespace.yaml b/apps/base/matrix/namespace.yaml
index a04bf7faf464a4ad7fc7ee1be906a78dfc90af64..835044fb48bf6f36cc9e1089e39c4cd2154d6b94 100644
--- a/apps/base/matrix/namespace.yaml
+++ b/apps/base/matrix/namespace.yaml
@@ -8,13 +8,13 @@ metadata:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: matrix-reconciler
+  name: flux-reconciler
   namespace: matrix
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: matrix-reconciler
+  name: flux-reconciler
   namespace: matrix
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -22,5 +22,5 @@ roleRef:
   name: admin
 subjects:
   - kind: ServiceAccount
-    name: matrix-reconciler
+    name: flux-reconciler
     namespace: matrix
diff --git a/apps/base/matrix/release.yaml b/apps/base/matrix/release.yaml
index b8ed5ea33c21b73ce741f6171e580e0ee1aee23d..397cb46d4d8a0545e71d28c1c946a0d1da3d66ec 100644
--- a/apps/base/matrix/release.yaml
+++ b/apps/base/matrix/release.yaml
@@ -4,7 +4,7 @@ metadata:
   name: matrix-synapse
   namespace: matrix
 spec:
-  serviceAccountName: matrix-reconciler
+  serviceAccountName: flux-reconciler
   timeout: 15m
   releaseName: matrix-synapse
   chart:
diff --git a/apps/base/nextcloud/namespace.yaml b/apps/base/nextcloud/namespace.yaml
index 63ffbfca3c61b75ce3b4a1358c57906fe385f946..78e9fd1cb1093d5a15dcf9ec282d48389ea2cd19 100644
--- a/apps/base/nextcloud/namespace.yaml
+++ b/apps/base/nextcloud/namespace.yaml
@@ -8,13 +8,13 @@ metadata:
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: nextcloud-reconciler
+  name: flux-reconciler
   namespace: nextcloud
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: nextcloud-reconciler
+  name: flux-reconciler
   namespace: nextcloud
 roleRef:
   apiGroup: rbac.authorization.k8s.io
@@ -22,5 +22,5 @@ roleRef:
   name: admin
 subjects:
   - kind: ServiceAccount
-    name: nextcloud-reconciler
+    name: flux-reconciler
     namespace: nextcloud
diff --git a/apps/base/nextcloud/release.yaml b/apps/base/nextcloud/release.yaml
index dcd83f581dac9e9d84a6ebc4408c9adec2ac9af8..06b40cf6fcedc48e47f9bf91229f6460e5ca6ca8 100644
--- a/apps/base/nextcloud/release.yaml
+++ b/apps/base/nextcloud/release.yaml
@@ -4,7 +4,7 @@ metadata:
   name: nextcloud
   namespace: nextcloud
 spec:
-  serviceAccountName: nextcloud-reconciler
+  serviceAccountName: flux-reconciler
   timeout: 5m
   releaseName: nextcloud
   chart: