diff --git a/library/common-test/ci/volsync-dest-values.yaml b/library/common-test/ci/volsync-dest-values.yaml
index 61556a42..b9eb0b6f 100644
--- a/library/common-test/ci/volsync-dest-values.yaml
+++ b/library/common-test/ci/volsync-dest-values.yaml
@@ -53,9 +53,9 @@ persistence:
 credentials:
   mys3:
     type: s3
-    url: ""
+    url: "test"
     region: ""
-    bucket: ""
-    accessKey: ""
-    secretKey: ""
-    encrKey: ""
+    bucket: "test"
+    accessKey: "test"
+    secretKey: "test"
+    encrKey: "test"
diff --git a/library/common-test/ci/volsync-src-values.yaml b/library/common-test/ci/volsync-src-values.yaml
index 3b0ca48d..df75d952 100644
--- a/library/common-test/ci/volsync-src-values.yaml
+++ b/library/common-test/ci/volsync-src-values.yaml
@@ -53,9 +53,9 @@ persistence:
 credentials:
   mys3:
     type: s3
-    url: ""
+    url: "test"
     region: ""
-    bucket: ""
-    accessKey: ""
-    secretKey: ""
-    encrKey: ""
+    bucket: "test"
+    accessKey: "test"
+    secretKey: "test"
+    encrKey: "test"
diff --git a/library/common/Chart.yaml b/library/common/Chart.yaml
index f04afc56..4ec61db0 100644
--- a/library/common/Chart.yaml
+++ b/library/common/Chart.yaml
@@ -15,7 +15,7 @@ maintainers:
 name: common
 sources: null
 type: library
-version: 22.0.1
+version: 22.0.2
 annotations:
   artifacthub.io/category: "integration-delivery"
   artifacthub.io/license: "BUSL-1.1"
diff --git a/library/common/templates/spawner/_pvc.tpl b/library/common/templates/spawner/_pvc.tpl
index a62728af..7a2cfffc 100644
--- a/library/common/templates/spawner/_pvc.tpl
+++ b/library/common/templates/spawner/_pvc.tpl
@@ -97,14 +97,14 @@
             {{- include "tc.v1.common.lib.metadata.validation" (dict "objectData" $volsyncData "caller" "PVC - VolSync") -}}
 
             {{/* Create Secret for VolSync */}}
-            {{- $volsyncSecretName := printf "%s-volsync-%s" $objectData.name $volsync.name -}}
+            {{- $volsyncSecretName := printf "%s-volsync-%s" $objectData.name $volsyncData.name -}}
             {{- $_ := set $volsyncData "repository" $volsyncSecretName -}}
 
             {{- $credentials := get $.Values.credentials $volsync.credentials -}}
 
-            {{- $resticrepository := printf "s3:%s/%s/volsync/%s" $credentials.url $credentials.bucket $.Release.Name $volsyncSecretName -}}
+            {{- $resticrepository := printf "s3:%s/%s/%s/volsync/%s-volsync-%s" $credentials.url $credentials.bucket $.Release.Name $objectData.shortName $volsyncData.name  -}}
             {{- if $credentials.path -}}
-            {{- $resticrepository = printf "s3:%s/%s/%s/volsync/%s" $credentials.url $credentials.bucket ( $credentials.path | trimSuffix "/" ) $.Release.Name $volsyncSecretName -}}
+            {{- $resticrepository = printf "s3:%s/%s/%s/%s/volsync/%s-volsync-%s" $credentials.url $credentials.bucket ( $credentials.path | trimSuffix "/" ) $.Release.Name $objectData.shortName $volsyncData.name -}}
             {{- end -}}
 
             {{- $resticpassword := ( $credentials.encrKey | default $.Release.Name ) -}}