diff --git a/component/tests/golden/cloudscale-metrics-collector-cloud/billing-collector-cloudservices/billing-collector-cloudservices/cloudscaleConfigMap.yaml b/component/tests/golden/cloudscale-metrics-collector-cloud/billing-collector-cloudservices/billing-collector-cloudservices/cloudscaleConfigMap.yaml
index 8253a38..c9bcdea 100644
--- a/component/tests/golden/cloudscale-metrics-collector-cloud/billing-collector-cloudservices/billing-collector-cloudservices/cloudscaleConfigMap.yaml
+++ b/component/tests/golden/cloudscale-metrics-collector-cloud/billing-collector-cloudservices/billing-collector-cloudservices/cloudscaleConfigMap.yaml
@@ -6,7 +6,7 @@ data:
   COLLECT_INTERVAL: '23'
   DAYS: '1'
   ODOO_OAUTH_TOKEN_URL: https://test.central.vshn.ch/api/v2/authentication/oauth2/token
-  ODOO_URL: https://test.central.vshn.ch/api/v2/authentication/oauth2/token
+  ODOO_URL: https://test.central.vshn.ch/api/v2/product_usage_report_POST
   PROM_URL: localhost:9090
 kind: ConfigMap
 metadata:
diff --git a/component/tests/golden/cloudscale-metrics-collector-cloud/billing-collector-cloudservices/billing-collector-cloudservices/cloudscaleExporter.yaml b/component/tests/golden/cloudscale-metrics-collector-cloud/billing-collector-cloudservices/billing-collector-cloudservices/cloudscaleExporter.yaml
index 58494b3..8804797 100644
--- a/component/tests/golden/cloudscale-metrics-collector-cloud/billing-collector-cloudservices/billing-collector-cloudservices/cloudscaleExporter.yaml
+++ b/component/tests/golden/cloudscale-metrics-collector-cloud/billing-collector-cloudservices/billing-collector-cloudservices/cloudscaleExporter.yaml
@@ -43,22 +43,10 @@ spec:
                 name: cloudscale-env
             - secretRef:
                 name: credentials-cloudscale
-          image: ghcr.io/vshn/billing-collector-cloudservices:change_exporter
+          image: ghcr.io/vshn/billing-collector-cloudservices:new-billing-cloud
           imagePullPolicy: IfNotPresent
-          livenessProbe:
-            httpGet:
-              path: /metrics
-              port: 9123
-            periodSeconds: 30
           name: exporter
-          ports:
-            - containerPort: 9123
-              name: exporter
-          readinessProbe:
-            httpGet:
-              path: /metrics
-              port: 9123
-            periodSeconds: 30
+          ports: []
           stdin: false
           tty: false
           volumeMounts: []
diff --git a/component/tests/golden/cloudscale-metrics-collector-managed/billing-collector-cloudservices/billing-collector-cloudservices/cloudscaleConfigMap.yaml b/component/tests/golden/cloudscale-metrics-collector-managed/billing-collector-cloudservices/billing-collector-cloudservices/cloudscaleConfigMap.yaml
index 81f80b7..c24ab0c 100644
--- a/component/tests/golden/cloudscale-metrics-collector-managed/billing-collector-cloudservices/billing-collector-cloudservices/cloudscaleConfigMap.yaml
+++ b/component/tests/golden/cloudscale-metrics-collector-managed/billing-collector-cloudservices/billing-collector-cloudservices/cloudscaleConfigMap.yaml
@@ -6,7 +6,7 @@ data:
   COLLECT_INTERVAL: '23'
   DAYS: '1'
   ODOO_OAUTH_TOKEN_URL: https://test.central.vshn.ch/api/v2/authentication/oauth2/token
-  ODOO_URL: https://test.central.vshn.ch/api/v2/authentication/oauth2/token
+  ODOO_URL: https://test.central.vshn.ch/api/v2/product_usage_report_POST
   PROM_URL: ''
 kind: ConfigMap
 metadata:
diff --git a/component/tests/golden/cloudscale-metrics-collector-managed/billing-collector-cloudservices/billing-collector-cloudservices/cloudscaleExporter.yaml b/component/tests/golden/cloudscale-metrics-collector-managed/billing-collector-cloudservices/billing-collector-cloudservices/cloudscaleExporter.yaml
index 58494b3..8804797 100644
--- a/component/tests/golden/cloudscale-metrics-collector-managed/billing-collector-cloudservices/billing-collector-cloudservices/cloudscaleExporter.yaml
+++ b/component/tests/golden/cloudscale-metrics-collector-managed/billing-collector-cloudservices/billing-collector-cloudservices/cloudscaleExporter.yaml
@@ -43,22 +43,10 @@ spec:
                 name: cloudscale-env
             - secretRef:
                 name: credentials-cloudscale
-          image: ghcr.io/vshn/billing-collector-cloudservices:change_exporter
+          image: ghcr.io/vshn/billing-collector-cloudservices:new-billing-cloud
           imagePullPolicy: IfNotPresent
-          livenessProbe:
-            httpGet:
-              path: /metrics
-              port: 9123
-            periodSeconds: 30
           name: exporter
-          ports:
-            - containerPort: 9123
-              name: exporter
-          readinessProbe:
-            httpGet:
-              path: /metrics
-              port: 9123
-            periodSeconds: 30
+          ports: []
           stdin: false
           tty: false
           volumeMounts: []
diff --git a/component/tests/golden/exoscale-metrics-collector-cloud/billing-collector-cloudservices/billing-collector-cloudservices/exoDbaasConfigMap.yaml b/component/tests/golden/exoscale-metrics-collector-cloud/billing-collector-cloudservices/billing-collector-cloudservices/exoDbaasConfigMap.yaml
index ad2e198..775c6e1 100644
--- a/component/tests/golden/exoscale-metrics-collector-cloud/billing-collector-cloudservices/billing-collector-cloudservices/exoDbaasConfigMap.yaml
+++ b/component/tests/golden/exoscale-metrics-collector-cloud/billing-collector-cloudservices/billing-collector-cloudservices/exoDbaasConfigMap.yaml
@@ -4,7 +4,7 @@ data:
   CLUSTER_ID: c-green-test-1234
   COLLECT_INTERVAL: '1'
   ODOO_OAUTH_TOKEN_URL: https://test.central.vshn.ch/api/v2/authentication/oauth2/token
-  ODOO_URL: https://test.central.vshn.ch/api/v2/authentication/oauth2/token
+  ODOO_URL: https://test.central.vshn.ch/api/v2/product_usage_report_POST
   PROM_URL: localhost:9090
 kind: ConfigMap
 metadata:
diff --git a/component/tests/golden/exoscale-metrics-collector-cloud/billing-collector-cloudservices/billing-collector-cloudservices/exoDbaasExporter.yaml b/component/tests/golden/exoscale-metrics-collector-cloud/billing-collector-cloudservices/billing-collector-cloudservices/exoDbaasExporter.yaml
index 1d69173..0130a25 100644
--- a/component/tests/golden/exoscale-metrics-collector-cloud/billing-collector-cloudservices/billing-collector-cloudservices/exoDbaasExporter.yaml
+++ b/component/tests/golden/exoscale-metrics-collector-cloud/billing-collector-cloudservices/billing-collector-cloudservices/exoDbaasExporter.yaml
@@ -43,22 +43,10 @@ spec:
                 name: exoscale-dbaas-env
             - secretRef:
                 name: credentials-exoscale-dbaas
-          image: ghcr.io/vshn/billing-collector-cloudservices:change_exporter
+          image: ghcr.io/vshn/billing-collector-cloudservices:new-billing-cloud
           imagePullPolicy: IfNotPresent
-          livenessProbe:
-            httpGet:
-              path: /metrics
-              port: 9123
-            periodSeconds: 30
           name: exporter
-          ports:
-            - containerPort: 9123
-              name: exporter
-          readinessProbe:
-            httpGet:
-              path: /metrics
-              port: 9123
-            periodSeconds: 30
+          ports: []
           stdin: false
           tty: false
           volumeMounts: []
diff --git a/component/tests/golden/exoscale-metrics-collector-cloud/billing-collector-cloudservices/billing-collector-cloudservices/exoObjectStorageConfigMap.yaml b/component/tests/golden/exoscale-metrics-collector-cloud/billing-collector-cloudservices/billing-collector-cloudservices/exoObjectStorageConfigMap.yaml
index 3698395..7180f59 100644
--- a/component/tests/golden/exoscale-metrics-collector-cloud/billing-collector-cloudservices/billing-collector-cloudservices/exoObjectStorageConfigMap.yaml
+++ b/component/tests/golden/exoscale-metrics-collector-cloud/billing-collector-cloudservices/billing-collector-cloudservices/exoObjectStorageConfigMap.yaml
@@ -5,7 +5,7 @@ data:
   CLUSTER_ID: c-green-test-1234
   COLLECT_INTERVAL: '23'
   ODOO_OAUTH_TOKEN_URL: https://test.central.vshn.ch/api/v2/authentication/oauth2/token
-  ODOO_URL: https://test.central.vshn.ch/api/v2/authentication/oauth2/token
+  ODOO_URL: https://test.central.vshn.ch/api/v2/product_usage_report_POST
   PROM_URL: localhost:9090
 kind: ConfigMap
 metadata:
diff --git a/component/tests/golden/exoscale-metrics-collector-cloud/billing-collector-cloudservices/billing-collector-cloudservices/exoObjectStorageExporter.yaml b/component/tests/golden/exoscale-metrics-collector-cloud/billing-collector-cloudservices/billing-collector-cloudservices/exoObjectStorageExporter.yaml
index 9d567d0..5587422 100644
--- a/component/tests/golden/exoscale-metrics-collector-cloud/billing-collector-cloudservices/billing-collector-cloudservices/exoObjectStorageExporter.yaml
+++ b/component/tests/golden/exoscale-metrics-collector-cloud/billing-collector-cloudservices/billing-collector-cloudservices/exoObjectStorageExporter.yaml
@@ -43,22 +43,10 @@ spec:
                 name: exoscale-objectstorage-env
             - secretRef:
                 name: credentials-exoscale-objectstorage
-          image: ghcr.io/vshn/billing-collector-cloudservices:change_exporter
+          image: ghcr.io/vshn/billing-collector-cloudservices:new-billing-cloud
           imagePullPolicy: IfNotPresent
-          livenessProbe:
-            httpGet:
-              path: /metrics
-              port: 9123
-            periodSeconds: 30
           name: exporter
-          ports:
-            - containerPort: 9123
-              name: exporter
-          readinessProbe:
-            httpGet:
-              path: /metrics
-              port: 9123
-            periodSeconds: 30
+          ports: []
           stdin: false
           tty: false
           volumeMounts: []
diff --git a/component/tests/golden/exoscale-metrics-collector-managed/billing-collector-cloudservices/billing-collector-cloudservices/exoDbaasConfigMap.yaml b/component/tests/golden/exoscale-metrics-collector-managed/billing-collector-cloudservices/billing-collector-cloudservices/exoDbaasConfigMap.yaml
index 7f3e186..ad74016 100644
--- a/component/tests/golden/exoscale-metrics-collector-managed/billing-collector-cloudservices/billing-collector-cloudservices/exoDbaasConfigMap.yaml
+++ b/component/tests/golden/exoscale-metrics-collector-managed/billing-collector-cloudservices/billing-collector-cloudservices/exoDbaasConfigMap.yaml
@@ -4,7 +4,7 @@ data:
   CLUSTER_ID: c-green-test-1234
   COLLECT_INTERVAL: '1'
   ODOO_OAUTH_TOKEN_URL: https://test.central.vshn.ch/api/v2/authentication/oauth2/token
-  ODOO_URL: https://test.central.vshn.ch/api/v2/authentication/oauth2/token
+  ODOO_URL: https://test.central.vshn.ch/api/v2/product_usage_report_POST
   PROM_URL: ''
 kind: ConfigMap
 metadata:
diff --git a/component/tests/golden/exoscale-metrics-collector-managed/billing-collector-cloudservices/billing-collector-cloudservices/exoDbaasExporter.yaml b/component/tests/golden/exoscale-metrics-collector-managed/billing-collector-cloudservices/billing-collector-cloudservices/exoDbaasExporter.yaml
index 1d69173..0130a25 100644
--- a/component/tests/golden/exoscale-metrics-collector-managed/billing-collector-cloudservices/billing-collector-cloudservices/exoDbaasExporter.yaml
+++ b/component/tests/golden/exoscale-metrics-collector-managed/billing-collector-cloudservices/billing-collector-cloudservices/exoDbaasExporter.yaml
@@ -43,22 +43,10 @@ spec:
                 name: exoscale-dbaas-env
             - secretRef:
                 name: credentials-exoscale-dbaas
-          image: ghcr.io/vshn/billing-collector-cloudservices:change_exporter
+          image: ghcr.io/vshn/billing-collector-cloudservices:new-billing-cloud
           imagePullPolicy: IfNotPresent
-          livenessProbe:
-            httpGet:
-              path: /metrics
-              port: 9123
-            periodSeconds: 30
           name: exporter
-          ports:
-            - containerPort: 9123
-              name: exporter
-          readinessProbe:
-            httpGet:
-              path: /metrics
-              port: 9123
-            periodSeconds: 30
+          ports: []
           stdin: false
           tty: false
           volumeMounts: []
diff --git a/component/tests/golden/exoscale-metrics-collector-managed/billing-collector-cloudservices/billing-collector-cloudservices/exoObjectStorageConfigMap.yaml b/component/tests/golden/exoscale-metrics-collector-managed/billing-collector-cloudservices/billing-collector-cloudservices/exoObjectStorageConfigMap.yaml
index d171835..4189835 100644
--- a/component/tests/golden/exoscale-metrics-collector-managed/billing-collector-cloudservices/billing-collector-cloudservices/exoObjectStorageConfigMap.yaml
+++ b/component/tests/golden/exoscale-metrics-collector-managed/billing-collector-cloudservices/billing-collector-cloudservices/exoObjectStorageConfigMap.yaml
@@ -5,7 +5,7 @@ data:
   CLUSTER_ID: c-green-test-1234
   COLLECT_INTERVAL: '23'
   ODOO_OAUTH_TOKEN_URL: https://test.central.vshn.ch/api/v2/authentication/oauth2/token
-  ODOO_URL: https://test.central.vshn.ch/api/v2/authentication/oauth2/token
+  ODOO_URL: https://test.central.vshn.ch/api/v2/product_usage_report_POST
   PROM_URL: ''
 kind: ConfigMap
 metadata:
diff --git a/component/tests/golden/exoscale-metrics-collector-managed/billing-collector-cloudservices/billing-collector-cloudservices/exoObjectStorageExporter.yaml b/component/tests/golden/exoscale-metrics-collector-managed/billing-collector-cloudservices/billing-collector-cloudservices/exoObjectStorageExporter.yaml
index 9d567d0..5587422 100644
--- a/component/tests/golden/exoscale-metrics-collector-managed/billing-collector-cloudservices/billing-collector-cloudservices/exoObjectStorageExporter.yaml
+++ b/component/tests/golden/exoscale-metrics-collector-managed/billing-collector-cloudservices/billing-collector-cloudservices/exoObjectStorageExporter.yaml
@@ -43,22 +43,10 @@ spec:
                 name: exoscale-objectstorage-env
             - secretRef:
                 name: credentials-exoscale-objectstorage
-          image: ghcr.io/vshn/billing-collector-cloudservices:change_exporter
+          image: ghcr.io/vshn/billing-collector-cloudservices:new-billing-cloud
           imagePullPolicy: IfNotPresent
-          livenessProbe:
-            httpGet:
-              path: /metrics
-              port: 9123
-            periodSeconds: 30
           name: exporter
-          ports:
-            - containerPort: 9123
-              name: exporter
-          readinessProbe:
-            httpGet:
-              path: /metrics
-              port: 9123
-            periodSeconds: 30
+          ports: []
           stdin: false
           tty: false
           volumeMounts: []