diff --git a/component/class/defaults.yml b/component/class/defaults.yml
index 9b2f091..5bb0e9e 100644
--- a/component/class/defaults.yml
+++ b/component/class/defaults.yml
@@ -1,16 +1,13 @@
 parameters:
   billing_collector_cloudservices:
-    =_metadata:
-      multi_instance: true
-
     namespace: appuio-cloud-reporting
 
     secrets:
       odoo:
         credentials:
           stringData:
-            ODOO_OAUTH_CLIENT_ID: "?{vaultkv:${cluster:tenant}/${cluster:name}/billing-collector-cloudservices/${_instance}/odoo-oauth-client-id}"
-            ODOO_OAUTH_CLIENT_SECRET: "?{vaultkv:${cluster:tenant}/${cluster:name}/billing-collector-cloudservices/${_instance}/odoo-oauth-client-secret}"
+            ODOO_OAUTH_CLIENT_ID: "?{vaultkv:${cluster:tenant}/${cluster:name}/billing-collector-cloudservices/odoo-oauth-client-id}"
+            ODOO_OAUTH_CLIENT_SECRET: "?{vaultkv:${cluster:tenant}/${cluster:name}/billing-collector-cloudservices/odoo-oauth-client-secret}"
       exoscale:
         credentials:
           stringData:
diff --git a/component/component/app.jsonnet b/component/component/app.jsonnet
index 4420ae1..8d6a5bf 100644
--- a/component/component/app.jsonnet
+++ b/component/component/app.jsonnet
@@ -2,9 +2,10 @@ local kap = import 'lib/kapitan.libjsonnet';
 local inv = kap.inventory();
 local paramsACR = inv.parameters.appuio_cloud_reporting;
 local argocd = import 'lib/argocd.libjsonnet';
-
 local instance = inv.parameters._instance;
-local app = argocd.App(instance, paramsACR.namespace);
+local params = inv.parameters.billing_collector_cloudservices;
+
+local app = argocd.App(instance, params.namespace);
 
 {
   [instance]: app,
diff --git a/component/component/main.jsonnet b/component/component/main.jsonnet
index 4c5d23b..e106b88 100644
--- a/component/component/main.jsonnet
+++ b/component/component/main.jsonnet
@@ -9,7 +9,6 @@ local component_name = 'billing-collector-cloudservices';
 local labels = {
   'app.kubernetes.io/name': component_name,
   'app.kubernetes.io/managed-by': 'commodore',
-  'app.kubernetes.io/part-of': 'appuio-cloud-reporting',
   'app.kubernetes.io/component': component_name,
 };