diff --git a/infrastructure/charts/node/templates/configmap-nginx.yaml b/infrastructure/charts/node/templates/configmap-nginx.yaml
index 688fe86c4..161112477 100644
--- a/infrastructure/charts/node/templates/configmap-nginx.yaml
+++ b/infrastructure/charts/node/templates/configmap-nginx.yaml
@@ -1,4 +1,5 @@
-{{- if .Values.vdr.externalResources.wallet.tls }}
+{{- if and (.Values.vdr.externalResources.wallet.tls)
+           (not (empty .Values.vdr.externalResources.db_sync.host)) }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
diff --git a/infrastructure/charts/node/templates/externalsecret.yaml b/infrastructure/charts/node/templates/externalsecret.yaml
index 3c57f92b8..965574193 100644
--- a/infrastructure/charts/node/templates/externalsecret.yaml
+++ b/infrastructure/charts/node/templates/externalsecret.yaml
@@ -19,8 +19,8 @@ spec:
     - extract:
         key: {{ .Values.secrets.dockerRegistryToken }}
 ---
-# Requires wallet to be created (atm it's done through terraform module)
-{{- if and (eq .Values.server.ledger "cardano") (not (empty .Values.vdr.cardanoWallet)) }}
+{{- if and (not (empty .Values.vdr.externalResources.wallet.host))
+           (not (empty .Values.vdr.externalResources.db_sync.host)) }}
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
@@ -38,7 +38,7 @@ spec:
         key: {{ .Values.vdr.cardanoWallet }}
 ---
 {{- end }}
-{{- if and (eq .Values.server.ledger "cardano") (not (empty .Values.vdr.externalResources.wallet.host)) }}
+{{- if not (empty .Values.vdr.externalResources.wallet.host) }}
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
@@ -56,7 +56,7 @@ spec:
         key: "{{ .Values.secrets.cardanoWallet }}"
 ---
 {{- end }}
-{{- if and (eq .Values.server.ledger "cardano") (not (empty .Values.vdr.externalResources.db_sync.host)) }}
+{{- if not (empty .Values.vdr.externalResources.db_sync.host) }}
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata: