diff --git a/.cruft.json b/.cruft.json
index f93d053a..6428b9b9 100644
--- a/.cruft.json
+++ b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/projectsyn/commodore-component-template.git",
-  "commit": "ba0ed2c8ff147199a748e9ff12cadce32c167fc0",
+  "commit": "98d16f99766e6c6d97322dbe42e058f0e2bf73d0",
   "checkout": "main",
   "context": {
     "cookiecutter": {
diff --git a/class/defaults.yml b/class/defaults.yml
index 804ff9ad..c74213f6 100644
--- a/class/defaults.yml
+++ b/class/defaults.yml
@@ -1,6 +1,7 @@
 parameters:
   rook_ceph:
-    =_metadata: {}
+    =_metadata:
+      multi_tenant: true
     namespace: syn-rook-ceph-operator
 
     ceph_cluster:
diff --git a/class/rook-ceph.yml b/class/rook-ceph.yml
index 69d7232c..4c9c5233 100644
--- a/class/rook-ceph.yml
+++ b/class/rook-ceph.yml
@@ -38,7 +38,7 @@ parameters:
       - input_paths:
           - rook-ceph/component/app.jsonnet
         input_type: jsonnet
-        output_path: apps/
+        output_path: .
       - input_paths:
           - rook-ceph/helmcharts/rook-ceph/${rook_ceph:charts:rook-ceph}
         input_type: helm
diff --git a/component/app.jsonnet b/component/app.jsonnet
index 3683220b..ae890fa9 100644
--- a/component/app.jsonnet
+++ b/component/app.jsonnet
@@ -5,6 +5,10 @@ local argocd = import 'lib/argocd.libjsonnet';
 
 local app = argocd.App('rook-ceph', params.namespace);
 
+local appPath =
+  local project = std.get(std.get(app, 'spec', {}), 'project', 'syn');
+  if project == 'syn' then 'apps' else 'apps-%s' % project;
+
 {
-  'rook-ceph': app,
+  ['%s/rook-ceph' % appPath]: app,
 }