diff --git a/.cruft.json b/.cruft.json
index f5d2374..f20e4ad 100644
--- a/.cruft.json
+++ b/.cruft.json
@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/projectsyn/commodore-component-template.git",
-  "commit": "8840f87d25d97ce0d4bfed75d40173caaf4100fc",
+  "commit": "98d16f99766e6c6d97322dbe42e058f0e2bf73d0",
   "checkout": "main",
   "context": {
     "cookiecutter": {
diff --git a/class/defaults.yml b/class/defaults.yml
index 0e4482f..3462c95 100644
--- a/class/defaults.yml
+++ b/class/defaults.yml
@@ -1,5 +1,7 @@
 parameters:
   system_upgrade_controller:
+    =_metadata:
+      multi_tenant: true
     images:
       system_upgrade_controller:
         registry: docker.io
diff --git a/class/system-upgrade-controller.yml b/class/system-upgrade-controller.yml
index 0bc778b..b53ae26 100644
--- a/class/system-upgrade-controller.yml
+++ b/class/system-upgrade-controller.yml
@@ -4,7 +4,7 @@ parameters:
       - input_paths:
           - system-upgrade-controller/component/app.jsonnet
         input_type: jsonnet
-        output_path: apps/
+        output_path: .
       - input_paths:
           - system-upgrade-controller/component/main.jsonnet
         input_type: jsonnet
diff --git a/component/app.jsonnet b/component/app.jsonnet
index e834275..8c6863f 100644
--- a/component/app.jsonnet
+++ b/component/app.jsonnet
@@ -5,6 +5,10 @@ local argocd = import 'lib/argocd.libjsonnet';
 
 local app = argocd.App('system-upgrade-controller', params.namespace);
 
+local appPath =
+  local project = std.get(std.get(app, 'spec', {}), 'project', 'syn');
+  if project == 'syn' then 'apps' else 'apps-%s' % project;
+
 {
-  'system-upgrade-controller': app,
+  ['%s/system-upgrade-controller' % appPath]: app,
 }