diff --git a/apps/production/custom-configs/element-values.yaml b/apps/production/custom-configs/element-values.yaml
new file mode 100644
index 0000000..f4678c5
--- /dev/null
+++ b/apps/production/custom-configs/element-values.yaml
@@ -0,0 +1,26 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: ess-element-custom
+  namespace: matrix
+data:
+  values.yaml: |
+    elementWeb:
+      additional:
+        config.json: |
+          {
+            "brand": "aXion1337.Chat",
+            "default_theme": "aXion1337 Dark",
+            "setting_defaults": {
+              "custom_themes": [
+                {
+                  "name": "aXion1337 Dark",
+                  "is_dark": true,
+                  "colors": {
+                    "accent-color": "#ffaf0f"
+                    // Deine restlichen Theme-Farben hier...
+                  }
+                }
+              ]
+            }
+          }
\ No newline at end of file
diff --git a/apps/production/custom-configs/synapse-values.yaml b/apps/production/custom-configs/synapse-values.yaml
new file mode 100644
index 0000000..2035219
--- /dev/null
+++ b/apps/production/custom-configs/synapse-values.yaml
@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: ess-synapse-custom
+  namespace: matrix
+data:
+  values.yaml: |
+    synapse:
+      logging:
+        rootLevel: INFO
+        levelOverrides:
+          synapse.media.url_previewer: DEBUG
+      additional:
+        url-previews:
+          config: |
+            url_preview_enabled: true
+            max_spider_size: 10M
+            # Deine restlichen URL-Preview und Retention Settings hier...
\ No newline at end of file
diff --git a/apps/production/element-server-suite.yaml b/apps/production/element-server-suite.yaml
index d3cfa24..4e640c5 100644
--- a/apps/production/element-server-suite.yaml
+++ b/apps/production/element-server-suite.yaml
@@ -13,6 +13,19 @@ spec:
         kind: HelmRepository
         name: element-ess-oci
         namespace: flux-system
+
+  # NEU: Hier zieht Flux deine Puzzleteile zusammen
+  valuesFrom:
+    - kind: ConfigMap
+      name: ess-synapse-custom
+      valuesKey: values.yaml
+    - kind: ConfigMap
+      name: ess-element-custom
+      valuesKey: values.yaml
+    - kind: Secret
+      name: ess-mas-custom-secrets
+      valuesKey: values.yaml
+      
   values:
     # Top-Level: serverName – das ist dein Matrix-Homeserver-Name
     serverName: axion1337.chat
diff --git a/apps/production/kustomization.yaml b/apps/production/kustomization.yaml
index 9b08cb9..7800a42 100644
--- a/apps/production/kustomization.yaml
+++ b/apps/production/kustomization.yaml
@@ -3,4 +3,9 @@ kind: Kustomization
 resources:
   - matrix-postgres-auth.yaml
   - cert-issuer.yaml
+  # Neue Dateien:
+  - custom-configs/synapse-values.yaml
+  - custom-configs/element-values.yaml
+  - custom-configs/mas-secrets.yaml # (oder .sops.yaml, je nach deiner SOPS-Einrichtung)
+  # HelmRelease (muss ganz unten stehen, damit die ConfigMaps vorher da sind!)
   - element-server-suite.yaml
\ No newline at end of file