diff --git a/Chart.yaml b/Chart.yaml
index 14cdfc3..d6c6e0b 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -6,6 +6,9 @@ version: 0.1.0
 appVersion: "1.0.0"
 
 dependencies:
+  - name: subcharts
+    version: 0.1.0
+    repository: "file://charts/subcharts"
   - name: dns
     version: 0.1.0
     repository: "file://charts/dns"
diff --git a/charts/subcharts/Chart.lock b/charts/subcharts/Chart.lock
new file mode 100644
index 0000000..e6f2224
--- /dev/null
+++ b/charts/subcharts/Chart.lock
@@ -0,0 +1,9 @@
+dependencies:
+- name: mariadb-operator-crds
+  repository: https://helm.mariadb.com/mariadb-operator
+  version: 0.38.1
+- name: mariadb-operator
+  repository: https://helm.mariadb.com/mariadb-operator
+  version: 0.38.1
+digest: sha256:488ca12800fb05f4a89dd178558f544c44f0d7af11bb07010031e45e38df3a28
+generated: "2025-07-05T14:11:03.425098652Z"
diff --git a/charts/subcharts/Chart.yaml b/charts/subcharts/Chart.yaml
new file mode 100644
index 0000000..24c4e23
--- /dev/null
+++ b/charts/subcharts/Chart.yaml
@@ -0,0 +1,10 @@
+apiVersion: v2
+name: home-server-subcharts
+version: 0.1.0
+dependencies:
+  - name: mariadb-operator-crds
+    version: 0.38.1
+    repository: https://helm.mariadb.com/mariadb-operator
+  - name: mariadb-operator
+    version: 0.38.1
+    repository: https://helm.mariadb.com/mariadb-operator
diff --git a/charts/subcharts/templates/namespace.yaml b/charts/subcharts/templates/namespace.yaml
new file mode 100644
index 0000000..1bef2cc
--- /dev/null
+++ b/charts/subcharts/templates/namespace.yaml
@@ -0,0 +1,5 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{ .Values.mariadbNamespace }}
diff --git a/charts/subcharts/values.yaml b/charts/subcharts/values.yaml
new file mode 100644
index 0000000..b7386ca
--- /dev/null
+++ b/charts/subcharts/values.yaml
@@ -0,0 +1,9 @@
+mariadbNamespace: mariadb-system-dev
+
+mariadb-operator:
+  fullnameOverride: mariadb-operator
+  namespaceOverride: mariadb-system
+  metrics:
+    enabled: true
+
+mariadb-operator-crds: {}
diff --git a/deployments/manifests/20-dev.yaml b/deployments/manifests/20-dev.yaml
index 300838c..a904cd0 100644
--- a/deployments/manifests/20-dev.yaml
+++ b/deployments/manifests/20-dev.yaml
@@ -13,3 +13,5 @@ spec:
         kind: GitRepository
         name: home-server-dev
         namespace: flux-system
+      values:
+        mariadbNamespace: mariadb-db-dev
diff --git a/deployments/manifests/20-prod.yaml b/deployments/manifests/20-prod.yaml
index 9dd5a3e..43225e6 100644
--- a/deployments/manifests/20-prod.yaml
+++ b/deployments/manifests/20-prod.yaml
@@ -13,3 +13,5 @@ spec:
         kind: GitRepository
         name: home-server-prod
         namespace: flux-system
+      values:
+        mariadbNamespace: mariadb-db