diff --git a/charts/iap/tests/certificate_test.yaml b/charts/iap/tests/certificate_test.yaml
index ba7e8b1..3904a8e 100644
--- a/charts/iap/tests/certificate_test.yaml
+++ b/charts/iap/tests/certificate_test.yaml
@@ -342,4 +342,27 @@ tests:
     asserts:
       - equal:
           path: metadata.annotations["foo"]
-          value: bar
\ No newline at end of file
+          value: bar
+
+  - it: should render keystores from values.certificate.keystores
+    set:
+      certificate.enabled: true
+      certificate.issuerRef.name: "test-issuer"
+      certificate.issuerRef.kind: "ClusterIssuer"
+      certificate.commonName: "test.com"
+      certificate.domain: "test.com"
+      certificate.renewBefore: "720h"
+      certificate.duration: "2160h"
+      certificate.keystores:
+        jks:
+          create: true
+          passwordSecretRef:
+            name: jks-password
+            key: password
+    asserts:
+      - equal:
+          path: spec.keystores.jks.create
+          value: true
+      - equal:
+          path: spec.keystores.jks.passwordSecretRef.name
+          value: jks-password
\ No newline at end of file
diff --git a/charts/iap/values.yaml b/charts/iap/values.yaml
index d48fa21..2b97fc5 100644
--- a/charts/iap/values.yaml
+++ b/charts/iap/values.yaml
@@ -173,7 +173,7 @@ certificate:
   # -- Specifies any private key properties
   privateKey: {} # include all required properties, passed to the template as is
   # -- Specifies any key store properties
-  keyStores: {} # include all required properties, passed to the template as is
+  keystores: {} # include all required properties, passed to the template as is
   # -- Specifies any subject fields required
   subject: {} # include all required properties, passed to the template as is