diff --git a/charts/bridges-common-relay/Chart.yaml b/charts/bridges-common-relay/Chart.yaml
index 2588470..87a746b 100644
--- a/charts/bridges-common-relay/Chart.yaml
+++ b/charts/bridges-common-relay/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: bridges-common-relay
 description: A Helm chart for bridges-common-relay
 type: application
-version: 1.2.0
+version: 1.2.1
 maintainers:
   - name: Parity
     url: https://github.com/paritytech/helm-charts
diff --git a/charts/bridges-common-relay/README.md b/charts/bridges-common-relay/README.md
index 25a8630..f45817b 100644
--- a/charts/bridges-common-relay/README.md
+++ b/charts/bridges-common-relay/README.md
@@ -18,7 +18,7 @@ This is intended behaviour. Make sure to run `git add -A` once again to stage ch
 
 # Parity Bridges Common helm chart
 
-![Version: 1.2.0](https://img.shields.io/badge/Version-1.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 1.2.1](https://img.shields.io/badge/Version-1.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 This helm chart installs [Parity Bridges Common](https://github.com/paritytech/parity-bridges-common) relayer.
 
diff --git a/charts/bridges-common-relay/templates/cronjob.yml b/charts/bridges-common-relay/templates/cronjob.yml
index 403968d..4e9c6a3 100644
--- a/charts/bridges-common-relay/templates/cronjob.yml
+++ b/charts/bridges-common-relay/templates/cronjob.yml
@@ -6,6 +6,8 @@
 {{- if $val.types_override }}
 {{- $typesArgs = printf " --types /types/%s" $typesFile }}
 {{- end }}
+{{- $hasSecrets := or $.Values.secrets $.Values.existingSecretName }}
+{{- $hasTypesOverride := (not (empty $val.types_override)) }}
 apiVersion: batch/v1
 kind: CronJob
 metadata:
@@ -32,13 +34,15 @@ spec:
         spec:
           restartPolicy: Never
           serviceAccountName: {{ include "bridges-common-relay.serviceAccountName" $ }}
-          {{- if or $.Values.secrets $.Values.existingSecretName }}
+          {{- if or $hasSecrets $hasTypesOverride }}
           volumes:
+          {{- if $hasSecrets }}
             - name: secrets
               secret:
                 secretName: {{ include "bridges-common-relay.secretName" $ }}
                 optional: false
-          {{- if $val.types_override }}
+          {{- end }}
+          {{- if $hasTypesOverride }}
             - name: {{ $typesVolumeName }}
               configMap:
                 name: {{ include "bridges-common-relay.fullname" $ }}-{{ $val.name | lower }}-types
@@ -94,12 +98,14 @@ spec:
                     tx.bridgeRelayers.claimRewards "$rewards_account_params"
               resources:
                 {{- toYaml $.Values.resources | nindent 16 }}
-             {{- if or $.Values.secrets $.Values.existingSecretName }}
+             {{- if or $hasSecrets $hasTypesOverride }}
               volumeMounts:
+              {{- if $hasSecrets }}
                 - name: secrets
                   mountPath: "/secrets"
                   readOnly: true
-              {{- if $val.types_override }}
+              {{- end }}
+              {{- if $hasTypesOverride }}
                 - name: {{ $typesVolumeName }}
                   mountPath: "/types"
                   readOnly: true