diff --git a/kustomize/base/gitea/kustomization.yaml b/kustomize/base/gitea/kustomization.yaml
index d9e85a0..108f0cd 100644
--- a/kustomize/base/gitea/kustomization.yaml
+++ b/kustomize/base/gitea/kustomization.yaml
@@ -1,13 +1,16 @@
+bases:
+  - ../mariadb
+
 resources:
   - namespace.yaml
   - gitea-deployment.yaml
   - drone-server-deployment.yaml
   - drone-runner-deployment.yaml
-  - mariadb-deployment.yaml
 
 secretGenerator:
   - name: mariadb-credentials-secret
     type: Opaque
+    behavior: replace
     literals:
       - database=gitea
       - username=gitea
diff --git a/kustomize/base/mariadb/kustomization.yaml b/kustomize/base/mariadb/kustomization.yaml
new file mode 100644
index 0000000..897864e
--- /dev/null
+++ b/kustomize/base/mariadb/kustomization.yaml
@@ -0,0 +1,10 @@
+resources:
+  - mariadb-deployment.yaml
+
+secretGenerator:
+  - name: mariadb-credentials-secret
+    type: Opaque
+    literals:
+      - database=mariadb
+      - username=mariadb
+      - password=replaceme
diff --git a/kustomize/base/gitea/mariadb-deployment.yaml b/kustomize/base/mariadb/mariadb-deployment.yaml
similarity index 100%
rename from kustomize/base/gitea/mariadb-deployment.yaml
rename to kustomize/base/mariadb/mariadb-deployment.yaml
diff --git a/kustomize/base/nextcloud/kustomization.yaml b/kustomize/base/nextcloud/kustomization.yaml
index c26fd1e..9b84f1f 100644
--- a/kustomize/base/nextcloud/kustomization.yaml
+++ b/kustomize/base/nextcloud/kustomization.yaml
@@ -1,12 +1,15 @@
+bases:
+  - ../mariadb
+
 resources:
   - namespace.yaml
   - nextcloud-deployment.yaml
   - nextcloud-cronjob.yaml
-  - mariadb-deployment.yaml
 
 secretGenerator:
   - name: mariadb-credentials-secret
     type: Opaque
+    behavior: replace
     literals:
       - database=nextcloud
       - username=nextcloud
diff --git a/kustomize/base/nextcloud/mariadb-deployment.yaml b/kustomize/base/nextcloud/mariadb-deployment.yaml
deleted file mode 100644
index 3f8745e..0000000
--- a/kustomize/base/nextcloud/mariadb-deployment.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: mariadb-deployment
-spec:
-  selector:
-    matchLabels:
-      app: mariadb
-  strategy:
-    type: Recreate
-  template:
-    metadata:
-      labels:
-        app: mariadb
-    spec:
-      containers:
-        - name: mariadb
-          image: mariadb:10.5.2
-          env:
-            - name: MYSQL_DATABASE
-              valueFrom:
-                secretKeyRef:
-                  name: mariadb-credentials-secret
-                  key: database
-            - name: MYSQL_USER
-              valueFrom:
-                secretKeyRef:
-                  name: mariadb-credentials-secret
-                  key: username
-            - name: MYSQL_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: mariadb-credentials-secret
-                  key: password
-            - name: MYSQL_RANDOM_ROOT_PASSWORD
-              value: "yes"
-          ports:
-            - name: mariadb
-              containerPort: 3306
-          volumeMounts:
-            - name: mariadb-pvc
-              mountPath: /var/lib/mysql
-      volumes:
-        - name: mariadb-pvc
-          persistentVolumeClaim:
-            claimName: mariadb-pvc
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: mariadb-pvc
-  labels:
-    app: mariadb
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 20Gi
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: mariadb
-  labels:
-    app: mariadb
-spec:
-  selector:
-    app: mariadb
-  ports:
-    - name: mariadb
-      port: 3306