diff --git a/lib/aws/chart_values/mongodb/q-values.j2.yaml b/lib/aws/chart_values/mongodb/q-values.j2.yaml
index 461ed841..3e513b15 100644
--- a/lib/aws/chart_values/mongodb/q-values.j2.yaml
+++ b/lib/aws/chart_values/mongodb/q-values.j2.yaml
@@ -344,9 +344,10 @@ persistence:
     - ReadWriteOnce
   size: {{ database_disk_size_in_gib }}Gi
   annotations:
+    ownerId: {{ owner_id }}
     envId: {{ environment_id }}
     databaseId: {{ id }}
-    databaseLongId: {{ long_id }}
+    databaseName: {{ sanitized_name }}
 
 ## Configure the ingress resource that allows you to access the
 ## MongoDB installation. Set up the URL
diff --git a/lib/aws/chart_values/mysql/q-values.j2.yaml b/lib/aws/chart_values/mysql/q-values.j2.yaml
index 15e57bad..218cf192 100644
--- a/lib/aws/chart_values/mysql/q-values.j2.yaml
+++ b/lib/aws/chart_values/mysql/q-values.j2.yaml
@@ -314,9 +314,10 @@ master:
     ## PVC annotations
     ##
     annotations:
+      ownerId: {{ owner_id }}
       envId: {{ environment_id }}
       databaseId: {{ id }}
-      databaseLongId: {{ long_id }}
+      databaseName: {{ sanitized_name }}
 
     ## Persistent Volume Access Mode
     ##
diff --git a/lib/aws/chart_values/postgresql/q-values.j2.yaml b/lib/aws/chart_values/postgresql/q-values.j2.yaml
index be1475e2..886a36b8 100644
--- a/lib/aws/chart_values/postgresql/q-values.j2.yaml
+++ b/lib/aws/chart_values/postgresql/q-values.j2.yaml
@@ -326,6 +326,7 @@ persistence:
     - ReadWriteOnce
   size: {{ database_disk_size_in_gib }}Gi
   annotations:
+    ownerId: {{ owner_id }}
     envId: {{ environment_id }}
     databaseId: {{ id }}
     databaseLongId: {{ long_id }}
diff --git a/lib/digitalocean/chart_values/mongodb/q-values.j2.yaml b/lib/digitalocean/chart_values/mongodb/q-values.j2.yaml
index 273f0404..409ff2ec 100644
--- a/lib/digitalocean/chart_values/mongodb/q-values.j2.yaml
+++ b/lib/digitalocean/chart_values/mongodb/q-values.j2.yaml
@@ -347,9 +347,10 @@ persistence:
     - ReadWriteOnce
   size: {{ database_disk_size_in_gib }}Gi
   annotations:
+    ownerId: {{ owner_id }}
     envId: {{ environment_id }}
     databaseId: {{ id }}
-    databaseLongId: {{ long_id }}
+    databaseName: '{{ sanitized_name }}'
 
 ## Configure the ingress resource that allows you to access the
 ## MongoDB installation. Set up the URL
diff --git a/lib/digitalocean/chart_values/mysql/q-values.j2.yaml b/lib/digitalocean/chart_values/mysql/q-values.j2.yaml
index 4a68de80..3c8ec5db 100644
--- a/lib/digitalocean/chart_values/mysql/q-values.j2.yaml
+++ b/lib/digitalocean/chart_values/mysql/q-values.j2.yaml
@@ -314,9 +314,10 @@ master:
     ## PVC annotations
     ##
     annotations:
+      ownerId: {{ owner_id }}
       envId: {{ environment_id }}
       databaseId: {{ id }}
-      databaseLongId: {{ long_id }}
+      databaseName: '{{ sanitized_name }}'
 
     ## Persistent Volume Access Mode
     ##
diff --git a/lib/digitalocean/chart_values/postgresql/q-values.j2.yaml b/lib/digitalocean/chart_values/postgresql/q-values.j2.yaml
index ad87ddcc..22c1974e 100644
--- a/lib/digitalocean/chart_values/postgresql/q-values.j2.yaml
+++ b/lib/digitalocean/chart_values/postgresql/q-values.j2.yaml
@@ -328,9 +328,10 @@ persistence:
     - ReadWriteOnce
   size: {{ database_disk_size_in_gib }}Gi
   annotations:
+    ownerId: {{ owner_id }}
     envId: {{ environment_id }}
     databaseId: {{ id }}
-    databaseLongId: {{ long_id }}
+    databaseName: '{{ sanitized_name }}'
 
 ## updateStrategy for PostgreSQL StatefulSet and its slaves StatefulSets
 ## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies
diff --git a/lib/scaleway/chart_values/mongodb/q-values.j2.yaml b/lib/scaleway/chart_values/mongodb/q-values.j2.yaml
index e1a609f6..e5a0d7d9 100644
--- a/lib/scaleway/chart_values/mongodb/q-values.j2.yaml
+++ b/lib/scaleway/chart_values/mongodb/q-values.j2.yaml
@@ -196,9 +196,10 @@ persistence:
     - ReadWriteOnce
   size: {{ database_disk_size_in_gib }}Gi
   annotations:
+    ownerId: {{ owner_id }}
     envId: {{ environment_id }}
     databaseId: {{ id }}
-    databaseLongId: {{ long_id }}
+    databaseName: '{{ sanitized_name }}'
     # volume.beta.kubernetes.io/storage-class=scw-sbv-ssd-0:
 
 ## Prometheus Exporter / Metrics
diff --git a/lib/scaleway/chart_values/mysql/q-values.j2.yaml b/lib/scaleway/chart_values/mysql/q-values.j2.yaml
index 7d66a8f4..612b39cd 100644
--- a/lib/scaleway/chart_values/mysql/q-values.j2.yaml
+++ b/lib/scaleway/chart_values/mysql/q-values.j2.yaml
@@ -292,9 +292,10 @@ master:
     ## PVC annotations
     ##
     annotations:
+      ownerId: {{ owner_id }}
       envId: {{ environment_id }}
       databaseId: {{ id }}
-      databaseLongId: {{ long_id }}
+      databaseName: '{{ sanitized_name }}'
 
     ## Persistent Volume Access Mode
     ##
diff --git a/lib/scaleway/chart_values/postgresql/q-values.j2.yaml b/lib/scaleway/chart_values/postgresql/q-values.j2.yaml
index b1a83685..9ca8052f 100644
--- a/lib/scaleway/chart_values/postgresql/q-values.j2.yaml
+++ b/lib/scaleway/chart_values/postgresql/q-values.j2.yaml
@@ -169,9 +169,10 @@ persistence:
     - ReadWriteOnce
   size: {{ database_disk_size_in_gib }}Gi
   annotations:
+    ownerId: {{ owner_id }}
     envId: {{ environment_id }}
     databaseId: {{ id }}
-    databaseLongId: {{ long_id }}
+    databaseName: '{{ sanitized_name }}'
 
 ##
 ## PostgreSQL Master parameters