diff --git a/library/common/templates/class/_cnpgCluster.tpl b/library/common/templates/class/_cnpgCluster.tpl
index 6779440a..0095707a 100644
--- a/library/common/templates/class/_cnpgCluster.tpl
+++ b/library/common/templates/class/_cnpgCluster.tpl
@@ -37,7 +37,7 @@ spec:
   {{- $olddbprevious2 := lookup "v1" "Secret" .Release.Namespace "dbcreds" }}
 
   bootstrap:
-  {{- if and .Values.postgresql.enabled ( or $olddbprevious1 $olddbprevious2 ) .Release.IsUpgrade }}
+  {{- if and $.Values.postgresql.enabled ( or $olddbprevious1 $olddbprevious2 ) $.Release.IsUpgrade }}
     pg_basebackup:
       source: old-db
   {{- else }}
@@ -80,7 +80,7 @@ spec:
     reusePVC: on
 
   externalClusters:
-  {{- if and .Values.postgresql.enabled ( or $olddbprevious1 $olddbprevious2 ) .Release.IsUpgrade }}
+  {{- if and $.Values.postgresql.enabled ( or $olddbprevious1 $olddbprevious2 ) $.Release.IsUpgrade }}
   - name: old-db
     connectionParameters:
       host: {{ (printf "%v-%v" .Release.Name "postgresql" ) }}
diff --git a/library/common/templates/spawner/_cnpg.tpl b/library/common/templates/spawner/_cnpg.tpl
index f939b8d5..9123805b 100644
--- a/library/common/templates/spawner/_cnpg.tpl
+++ b/library/common/templates/spawner/_cnpg.tpl
@@ -37,9 +37,9 @@
     {{- $dbprevious := lookup "v1" "Secret" $.Release.Namespace ( printf "%s-user" $cnpgValues.name ) }}
     {{- if $dbprevious }}
       {{- $dbPass = ( index $dbprevious.data "user-password" ) | b64dec  }}
-    {{- else if and .Values.postgresql.enabled $olddbprevious1 .Release.IsUpgrade }}
+    {{- else if and $.Values.postgresql.enabled $olddbprevious1 $.Release.IsUpgrade }}
       {{- $dbPass = ( index $olddbprevious1.data "postgresql-password" ) | b64dec  }}
-    {{- else if and .Values.postgresql.enabled $olddbprevious2 .Release.IsUpgrade }}
+    {{- else if and $.Values.postgresql.enabled $olddbprevious2 $.Release.IsUpgrade }}
       {{- $dbPass = ( index $olddbprevious2.data "postgresql-password" ) | b64dec  }}
     {{- else }}
       {{- $dbPass = $cnpgValues.password | default ( randAlphaNum 62 ) }}
@@ -49,9 +49,9 @@
     {{- $pgprevious := lookup "v1" "Secret" $.Release.Namespace ( printf "%s-superuser" $cnpgValues.name ) }}
     {{- if $pgprevious }}
       {{- $pgPass = ( index $dbprevious.data "superuser-password" ) | b64dec  }}
-    {{- else if and .Values.postgresql.enabled $olddbprevious1 .Release.IsUpgrade }}
+    {{- else if and $.Values.postgresql.enabled $olddbprevious1 $.Release.IsUpgrade }}
       {{- $pgPass = ( index $olddbprevious1.data "postgresql-postgres-password" ) | b64dec  }}
-    {{- else if and .Values.postgresql.enabled $olddbprevious2 .Release.IsUpgrade }}
+    {{- else if and $.Values.postgresql.enabled $olddbprevious2 $.Release.IsUpgrade }}
       {{- $pgPass = ( index $olddbprevious2.data "postgresql-postgres-password" ) | b64dec  }}
     {{- else }}
       {{- $pgPass = $cnpgValues.superUserPassword | default ( randAlphaNum 62 ) }}