diff --git a/charts/library/common-test/tests/volsync/replication_src_spec_test.yaml b/charts/library/common-test/tests/volsync/replication_src_spec_test.yaml
index 7cb6cc59b24..6290bbfb503 100644
--- a/charts/library/common-test/tests/volsync/replication_src_spec_test.yaml
+++ b/charts/library/common-test/tests/volsync/replication_src_spec_test.yaml
@@ -64,8 +64,6 @@ tests:
           content:
             repository: test-release-name-common-test-srcbackup-volsync-mybackup1
             copyMethod: Snapshot
-            cleanupTempPVC: false
-            cleanupCachePVC: false
             pruneIntervalDays: 7
             retain:
               hourly: 6
@@ -130,8 +128,6 @@ tests:
           content:
             repository: test-release-name-common-test-srcbackup-volsync-mybackup1
             copyMethod: Clone
-            cleanupTempPVC: false
-            cleanupCachePVC: false
             pruneIntervalDays: 5
             retain:
               hourly: 20
@@ -195,8 +191,6 @@ tests:
           content:
             repository: test-release-name-common-test-srcbackup-volsync-mybackup1
             copyMethod: Clone
-            cleanupTempPVC: false
-            cleanupCachePVC: false
             pruneIntervalDays: 5
             retain:
               hourly: 20
@@ -261,8 +255,6 @@ tests:
           content:
             repository: test-release-name-common-test-srcbackup-volsync-mybackup1
             copyMethod: Clone
-            cleanupTempPVC: false
-            cleanupCachePVC: false
             pruneIntervalDays: 5
             retain:
               hourly: 20
@@ -328,8 +320,6 @@ tests:
           content:
             repository: test-release-name-common-test-srcbackup-volsync-mybackup1
             copyMethod: Clone
-            cleanupTempPVC: false
-            cleanupCachePVC: false
             pruneIntervalDays: 5
             retain:
               hourly: 20
@@ -349,58 +339,3 @@ tests:
         matchRegex:
           path: spec.restic.unlock
           pattern: "^[0-9]{14}$"
-
-  - it: should generate correct spec with cleanup flags
-    set:
-      persistence:
-        srcbackup:
-          enabled: true
-          type: pvc
-          mountPath: /backedup
-          volsync:
-            - name: mybackup1
-              type: restic
-              credentials: mys3
-              copyMethod: Clone
-              cleanupTempPVC: true
-              cleanupCachePVC: true
-              dest:
-                enabled: false
-              src:
-                enabled: true
-                trigger:
-                  schedule: "1 0 * * *"
-                retain:
-                  hourly: 20
-                  daily: 5
-                  weekly: 3
-                pruneIntervalDays: 5
-      credentials: *credentials
-    asserts:
-      - documentIndex: *replicationDestDoc
-        isKind:
-          of: ReplicationSource
-      - documentIndex: *replicationDestDoc
-        isAPIVersion:
-          of: volsync.backube/v1alpha1
-      - documentIndex: *replicationDestDoc
-        isSubset:
-          path: spec.restic
-          content:
-            repository: test-release-name-common-test-srcbackup-volsync-mybackup1
-            copyMethod: Clone
-            cleanupTempPVC: true
-            cleanupCachePVC: true
-            pruneIntervalDays: 5
-            retain:
-              hourly: 20
-              daily: 5
-              weekly: 3
-              monthly: 3
-              yearly: 1
-            accessModes:
-              - ReadWriteOnce
-            moverSecurityContext:
-              fsGroup: 568
-              runAsUser: 568
-              runAsGroup: 568
diff --git a/charts/library/common/Chart.yaml b/charts/library/common/Chart.yaml
index 990a272cbc1..1663f337084 100644
--- a/charts/library/common/Chart.yaml
+++ b/charts/library/common/Chart.yaml
@@ -48,4 +48,4 @@ sources:
   - https://hub.docker.com/_/
   - https://hub.docker.com/r/mikefarah/yq
 type: library
-version: 25.3.0
+version: 25.3.1
diff --git a/charts/library/common/templates/class/volsync/_replicationSource.tpl b/charts/library/common/templates/class/volsync/_replicationSource.tpl
index 13dbc668860..725576aabcf 100644
--- a/charts/library/common/templates/class/volsync/_replicationSource.tpl
+++ b/charts/library/common/templates/class/volsync/_replicationSource.tpl
@@ -22,15 +22,6 @@ objectData:
     {{- $schedule = $volsyncData.src.trigger.schedule -}}
   {{- end -}}
 
-  {{- $cleanupTempPVC := false -}}
-  {{- $cleanupCachePVC := false -}}
-  {{- if and (hasKey $volsyncData "cleanupTempPVC") (kindIs "bool" $volsyncData.cleanupTempPVC) -}}
-    {{- $cleanupTempPVC = $volsyncData.cleanupTempPVC -}}
-  {{- end -}}
-  {{- if and (hasKey $volsyncData "cleanupCachePVC") (kindIs "bool" $volsyncData.cleanupCachePVC) -}}
-    {{- $cleanupCachePVC = $volsyncData.cleanupCachePVC -}}
-  {{- end -}}
-
   {{- $retain := dict "hourly" 6 "daily" 5 "weekly" 4 "monthly" 3 "yearly" 1 -}}
   {{- if $volsyncData.src.retain -}}
     {{- $items := list "hourly" "daily" "weekly" "monthly" "yearly"  -}}
@@ -63,8 +54,6 @@ spec:
   {{ $volsyncData.type }}:
     repository: {{ $volsyncData.repository }}
     copyMethod: {{ $volsyncData.copyMethod | default "Snapshot" }}
-    cleanupTempPVC: {{ $cleanupTempPVC }}
-    cleanupCachePVC: {{ $cleanupCachePVC }}
     pruneIntervalDays: {{ $volsyncData.src.pruneIntervalDays | default 7 }}
     unlock: {{ now | date "20060102150405" | quote }}
     retain: