diff --git a/helmfiles/platform.yaml b/helmfiles/platform.yaml
index 1970933..115fb7e 100644
--- a/helmfiles/platform.yaml
+++ b/helmfiles/platform.yaml
@@ -16,12 +16,12 @@ repositories:
     url: https://zotregistry.dev/helm-charts/
   - name: goauthentik
     url: https://charts.goauthentik.io/
-
+  - name: flux-community
+    url: ghcr.io/fluxcd-community/charts
+    oci: true
 releases:
   - name: external-dns
     chart: external-dns/external-dns
-    labels:
-      layer: platform
     version: 1.15.2
     namespace: platform
     inherit:
@@ -29,6 +29,13 @@ releases:
       - template: env-values
       - template: env-secrets
 
+  - name: flux2
+    chart: flux-community/flux2
+    version: 2.15.0
+    namespace: flux-system
+    inherit:
+      - template: common-values-tpl
+
   - name: keel
     chart: keel/keel
     version: v1.0.5
diff --git a/installations/applications/helmfile-badhouseplants.yaml b/installations/applications/helmfile-badhouseplants.yaml
index 058297d..9aa6e24 100644
--- a/installations/applications/helmfile-badhouseplants.yaml
+++ b/installations/applications/helmfile-badhouseplants.yaml
@@ -16,17 +16,6 @@ repositories:
     #  url: git+https://gitea.badhouseplants.net/badhouseplants/open-strike-2.git@helm?ref=main
 
 releases:
-  - name: gitea
-    chart: gitea/gitea
-    version: 11.0.0
-    namespace: applications
-    installed: false
-    inherit:
-      - template: default-env-values
-      - template: default-env-secrets
-      - template: ext-database
-      - template: ext-tcp-routes
-
   - name: app-vaultwarden
     chart: allangers-charts/vaultwarden
     version: 3.1.1
@@ -43,16 +32,6 @@ releases:
       - template: env-values
       - template: env-secrets
 
-  - name: app-tandoor-recipes
-    installed: false
-    chart: allangers-charts/tandoor-recipes
-    version: 0.2.0
-    namespace: org-badhouseplants
-    inherit:
-      - template: env-values
-      - template: env-secrets
-      - template: ext-database
-
   - name: app-tandoor-recipes
     chart: allangers-charts/tandoor-recipes
     version: 0.2.0
@@ -78,14 +57,6 @@ releases:
       - template: env-values
       - template: env-secrets
 
-  - name: app-gitea
-    chart: gitea/gitea
-    version: 11.0.0
-    namespace: org-badhouseplants
-    inherit:
-      - template: env-values
-      - template: env-secrets
-
   - name: server-xray-public
     chart: allangers-charts/server-xray
     namespace: public-xray
@@ -99,7 +70,7 @@ releases:
 
   - name: server-xray-public-edge
     chart: allangers-charts/server-xray
-    installed: true
+    installed: false
     namespace: public-xray
     version: 0.6.0
     inherit:
diff --git a/installations/applications/helmfile-xray-1.yaml b/installations/applications/helmfile-xray-1.yaml
deleted file mode 100644
index 5d219d6..0000000
--- a/installations/applications/helmfile-xray-1.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-bases:
-  - ../../common/environments.yaml
-  - ../../common/templates.yaml
-repositories:
-  - name: allangers-charts
-    url: ghcr.io/allanger/allangers-charts
-    oci: true
-releases:
-  - name: server-xray-public
-    chart: allangers-charts/server-xray
-    namespace: public-xray
-    version: 0.6.0
-    inherit:
-      - template: default-env-secrets
-      - template: default-env-values
-      - template: ext-self-signed-cert
-  - name: promtail
-    chart: grafana/promtail
-    namespace: promtail
-    version: 6.16.6
-    inherit:
-      - template: default-env-values
-      - template: default-env-secrets
diff --git a/installations/applications/helmfile-xray-2.yaml b/installations/applications/helmfile-xray-2.yaml
deleted file mode 100644
index f83c4ea..0000000
--- a/installations/applications/helmfile-xray-2.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-bases:
-  - ../../common/environments.yaml
-  - ../../common/templates.yaml
-repositories:
-  - name: allangers-charts
-    url: ghcr.io/allanger/allangers-charts
-    oci: true
-releases:
-  - name: server-xray-public
-    chart: allangers-charts/server-xray
-    namespace: public-xray
-    version: 0.6.0
-    inherit:
-      - template: default-env-secrets
-      - template: default-env-values
-      - template: ext-self-signed-cert
diff --git a/values/badhouseplants/kube-system/namespaces/values.yaml b/values/badhouseplants/kube-system/namespaces/values.yaml
index f37d14b..76ae17a 100644
--- a/values/badhouseplants/kube-system/namespaces/values.yaml
+++ b/values/badhouseplants/kube-system/namespaces/values.yaml
@@ -1,5 +1,7 @@
 namespaces:
   - name: registry
+  - name: flux-system
+    defaultRegcred: true
   - name: kube-system
     defaultRegcred: true
   - name: production
@@ -22,8 +24,6 @@ namespaces:
     defaultRegcred: true
   - name: games
     defaultRegcred: true
-  - name: team-fortress-2
-    defaultRegcred: true
   - name: pipelines
     defaultRegcred: true
   - name: public-xray
diff --git a/values/common/flux-system/flux2/values.gotmpl b/values/common/flux-system/flux2/values.gotmpl
new file mode 100644
index 0000000..99873d7
--- /dev/null
+++ b/values/common/flux-system/flux2/values.gotmpl
@@ -0,0 +1,22 @@
+imagePullSecrets:
+  - name: regcred
+cli:
+  image: {{ .Values.registry }}/fluxcd/flux-cli
+helmController:
+  create: true
+  image: {{ .Values.registry }}/fluxcd/helm-controller
+imageAutomationController:
+  create: false
+  image: {{ .Values.registry }}/fluxcd/image-automation-controller
+imageReflectionController:
+  create: false
+  image: {{ .Values.registry }}/fluxcd/image-reflector-controller
+kustomizeController:
+  create: true
+  image: {{ .Values.registry }}/fluxcd/kustomize-controller
+notificationController:
+  create: false
+  image: {{ .Values.registry }}/fluxcd/notification-controller
+sourceController:
+  create: true
+  image: {{ .Values.registry }}/fluxcd/source-controller