diff --git a/pkg/exoscale/dbaas.go b/pkg/exoscale/dbaas.go
index fb4ffb1..938003f 100644
--- a/pkg/exoscale/dbaas.go
+++ b/pkg/exoscale/dbaas.go
@@ -3,6 +3,7 @@ package exoscale
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	egoscale "github.com/exoscale/egoscale/v2"
@@ -16,7 +17,7 @@ import (
 	k8s "sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-const productIdPrefix = "appcat-exoscale-dbaas"
+const productIdPrefix = "appcat-exoscale"
 
 var (
 	groupVersionKinds = map[string]schema.GroupVersionKind{
@@ -218,9 +219,8 @@ func (ds *DBaaS) AggregateDBaaS(ctx context.Context, exoscaleDBaaS []*egoscale.D
 				}
 			}
 
-			// TODO zones and namespaces?
 			o := odoo.OdooMeteredBillingRecord{
-				ProductID:            productIdPrefix + fmt.Sprintf("-%s-%s", *dbaasUsage.Type, *dbaasUsage.Plan),
+				ProductID:            productIdPrefix + fmt.Sprintf("-%s-%s", strings.ToLower(dbaasTypes[*dbaasUsage.Type]), *dbaasUsage.Plan),
 				InstanceID:           instanceId,
 				ItemDescription:      "Exoscale DBaaS " + dbaasTypes[*dbaasUsage.Type],
 				ItemGroupDescription: itemGroup,
diff --git a/pkg/exoscale/dbaas_test.go b/pkg/exoscale/dbaas_test.go
index c025b7a..33066b5 100644
--- a/pkg/exoscale/dbaas_test.go
+++ b/pkg/exoscale/dbaas_test.go
@@ -19,7 +19,7 @@ func TestDBaaS_aggregatedDBaaS(t *testing.T) {
 
 	now := time.Now().In(location)
 	record1 := odoo.OdooMeteredBillingRecord{
-		ProductID:            "appcat-exoscale-dbaas-pg-hobbyist-2",
+		ProductID:            "appcat-exoscale-pg-hobbyist-2",
 		InstanceID:           "ch-gva-2/postgres-abc",
 		ItemDescription:      "Exoscale DBaaS PostgreSQL",
 		ItemGroupDescription: "APPUiO Managed - Zone: c-test1 / Namespace: vshn-xyz",
@@ -32,7 +32,7 @@ func TestDBaaS_aggregatedDBaaS(t *testing.T) {
 		},
 	}
 	record2 := odoo.OdooMeteredBillingRecord{
-		ProductID:            "appcat-exoscale-dbaas-pg-business-128",
+		ProductID:            "appcat-exoscale-pg-business-128",
 		InstanceID:           "ch-gva-2/postgres-def",
 		ItemDescription:      "Exoscale DBaaS PostgreSQL",
 		ItemGroupDescription: "APPUiO Managed - Zone: c-test1 / Namespace: vshn-uvw",