diff --git a/charts/esignet/values.yaml b/charts/esignet/values.yaml
index b56f2ed..0edec72 100644
--- a/charts/esignet/values.yaml
+++ b/charts/esignet/values.yaml
@@ -435,7 +435,7 @@ kafka:
   controller:
     heapOpts: ""
     replicaCount: 1
-    resources: {}
+    resourcesPreset: "none"
   broker:
     heapOpts: ""
     persistence:
diff --git a/charts/keymanager/values.yaml b/charts/keymanager/values.yaml
index a910cd8..70bbaa1 100644
--- a/charts/keymanager/values.yaml
+++ b/charts/keymanager/values.yaml
@@ -566,6 +566,9 @@ envVars:
   mosip_kernel_tokenid_partnercode_salt: ''
   mosip_admin_client_secret: ''
 
+  # Set true to tell Keymanager to wait for HSM
+  mosip_kernel_keymgr_hsm_health_check_enabled: false
+
 envVarsFrom:
   artifactory_url_env:
     configMapKeyRef: