diff --git a/argocd/apps/minio-operator.yaml b/argocd/apps/minio-operator.yaml
new file mode 100644
index 0000000..8b6d5cf
--- /dev/null
+++ b/argocd/apps/minio-operator.yaml
@@ -0,0 +1,20 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: minio-operator
+  namespace: argocd
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  project: default
+  source:
+    repoURL: https://operator.min.io/
+    chart: operator
+    targetRevision: "7.1.1"
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: minio-operator
+  syncPolicy:
+    syncOptions:
+      - CreateNamespace=true
+      - ServerSideApply=true
diff --git a/argocd/apps/minio-tenant.yaml b/argocd/apps/minio-tenant.yaml
new file mode 100644
index 0000000..dcf5ca3
--- /dev/null
+++ b/argocd/apps/minio-tenant.yaml
@@ -0,0 +1,22 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: minio-tenant
+  namespace: argocd
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  project: default
+  source:
+    repoURL: http://gitea.gitea.svc.cluster.local:3000/admin/main.git
+    targetRevision: master
+    path: manifests/minio
+    directory:
+      recurse: true
+      include: "*.yaml"
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: minio
+  syncPolicy:
+    syncOptions:
+      - CreateNamespace=true
diff --git a/argocd/apps/minio.yaml b/argocd/apps/minio.yaml
deleted file mode 100644
index cad2ce5..0000000
--- a/argocd/apps/minio.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: minio
-  namespace: argocd
-  finalizers:
-    - resources-finalizer.argocd.argoproj.io
-spec:
-  project: default
-  source:
-    repoURL: https://charts.min.io/
-    chart: minio
-    targetRevision: "5.4.0"
-    helm:
-      values: |
-        mode: standalone
-        rootUser: admin
-        rootPassword: change-me
-        persistence:
-          enabled: true
-          size: 20Gi
-          storageClass: yc-network-hdd
-        resources:
-          requests:
-            cpu: 100m
-            memory: 256Mi
-          limits:
-            cpu: 500m
-            memory: 512Mi
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: minio
-  syncPolicy:
-    syncOptions:
-      - CreateNamespace=true
diff --git a/manifests/minio/secrets.yaml b/manifests/minio/secrets.yaml
new file mode 100644
index 0000000..5620348
--- /dev/null
+++ b/manifests/minio/secrets.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: shared-minio-creds
+  namespace: minio
+type: Opaque
+stringData:
+  accesskey: admin
+  secretkey: change-me
diff --git a/manifests/minio/tenant.yaml b/manifests/minio/tenant.yaml
new file mode 100644
index 0000000..a89fb4c
--- /dev/null
+++ b/manifests/minio/tenant.yaml
@@ -0,0 +1,33 @@
+apiVersion: minio.min.io/v2
+kind: Tenant
+metadata:
+  name: shared-minio
+  namespace: minio
+spec:
+  pools:
+    - servers: 1
+      name: pool-0
+      volumesPerServer: 1
+      volumeClaimTemplate:
+        metadata:
+          name: data
+        spec:
+          accessModes:
+            - ReadWriteOnce
+          resources:
+            requests:
+              storage: 20Gi
+          storageClassName: yc-network-hdd
+      resources:
+        requests:
+          cpu: 100m
+          memory: 256Mi
+        limits:
+          cpu: 500m
+          memory: 512Mi
+  configuration:
+    name: shared-minio-creds
+  mountPath: /export
+  requestAutoCert: false
+  buckets:
+    - name: mastodon