diff --git a/charts/semantic-hub/Chart.yaml b/charts/semantic-hub/Chart.yaml
index 3dc68a1..20e1cd7 100644
--- a/charts/semantic-hub/Chart.yaml
+++ b/charts/semantic-hub/Chart.yaml
@@ -26,7 +26,7 @@ sources:
   - https://github.com/eclipse-tractusx/sldt-semantic-hub
 
 type: application
-version: 0.2.1-RC2
+version: 0.2.1-RC3
 appVersion: 0.3.1-RC1
 dependencies:
   - repository: https://charts.bitnami.com/bitnami
diff --git a/charts/semantic-hub/templates/graphdb/graphdb-deployment.yaml b/charts/semantic-hub/templates/graphdb/graphdb-deployment.yaml
index 5ec908a..b110541 100644
--- a/charts/semantic-hub/templates/graphdb/graphdb-deployment.yaml
+++ b/charts/semantic-hub/templates/graphdb/graphdb-deployment.yaml
@@ -19,6 +19,7 @@
 ###############################################################
 
 {{- if and (.Values.graphdb.enabled) (not .Values.hub.embeddedTripleStore) }}
+{{- $pvc_name := printf "cx-%s-graphdb-pvc" .Release.Name }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -63,5 +64,5 @@ spec:
       volumes:
         - name: graphdbdata
           persistentVolumeClaim:
-            claimName: {{ include "hub.fullname" .}}-graphdb
+            claimName: {{ $pvc_name }}
 {{- end -}}
diff --git a/charts/semantic-hub/templates/graphdb/graphdb-pvc.yaml b/charts/semantic-hub/templates/graphdb/graphdb-pvc.yaml
index 364bd23..36aac92 100644
--- a/charts/semantic-hub/templates/graphdb/graphdb-pvc.yaml
+++ b/charts/semantic-hub/templates/graphdb/graphdb-pvc.yaml
@@ -19,10 +19,11 @@
 ###############################################################
 
 {{- if and (.Values.graphdb.enabled) (not .Values.hub.embeddedTripleStore) }}
+{{- $pvc_name := printf "cx-%s-graphdb-pvc" .Release.Name }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ include "hub.fullname" .}}-graphdb
+  name: {{ $pvc_name }}
 spec:
   storageClassName: {{ .Values.graphdb.storageClassName }}
   accessModes: