diff --git a/library/common/templates/class/volsync/_replicationSource.tpl b/library/common/templates/class/volsync/_replicationSource.tpl
index 3c6c7288..e7ebf864 100644
--- a/library/common/templates/class/volsync/_replicationSource.tpl
+++ b/library/common/templates/class/volsync/_replicationSource.tpl
@@ -23,9 +23,8 @@ objectData:
   {{- end }}
 
   {{- $retain := dict "hourly" 24 "daily" 7 "weekly" 5 -}}
-  {{- $items := list "hourly" "daily" "weekly" -}}
-
   {{- if $volsyncData.src.retain -}}
+    {{- $items := list "hourly" "daily" "weekly" -}}
     {{- range $item := $items -}}
       {{- with get $volsyncData.src.retain $item -}}
         {{- $_ := set $retain $item . -}}
diff --git a/library/common/templates/lib/volsync/_moverSecurityContext.tpl b/library/common/templates/lib/volsync/_moverSecurityContext.tpl
index 49bdbcd2..f86162db 100644
--- a/library/common/templates/lib/volsync/_moverSecurityContext.tpl
+++ b/library/common/templates/lib/volsync/_moverSecurityContext.tpl
@@ -12,8 +12,8 @@
       "fsGroup" $rootCtx.Values.securityContext.pod.fsGroup
   -}}
 
-  {{- $items := list "runAsUser" "runAsGroup" "fsGroup" -}}
   {{- if $target.moverSecurityContext -}}
+    {{- $items := list "runAsUser" "runAsGroup" "fsGroup" -}}
     {{- range $item := $items -}}
       {{- if hasKey $target.moverSecurityContext $item -}}
         {{- $_ := set $sec $item (get $target.moverSecurityContext $item) -}}