diff --git a/modules/drivers/oracle/resources-ee/metabase-plugin.yaml b/modules/drivers/oracle/resources-ee/metabase-plugin.yaml
index 695e7d5bbc4d023786ab9bdb9f511d56e60a28c0..0329057de4b0e35c9ccbe5ce9ba58bd6f593c02c 100644
--- a/modules/drivers/oracle/resources-ee/metabase-plugin.yaml
+++ b/modules/drivers/oracle/resources-ee/metabase-plugin.yaml
@@ -18,8 +18,12 @@ driver:
     - name: service-name
       display-name: Oracle service name
       placeholder: Optional TNS alias
-    - user
-    - password
+    - merge:
+        - user
+        - required: false
+    - merge:
+        - password
+        - required: false
     - cloud-ip-address-info
     - ssl
     - name: ssl-use-keystore
@@ -28,10 +32,10 @@ driver:
       visible-if:
         ssl: true
     - name: ssl-keystore
-      display-name: Keystore
+      display-name: Keystore (PKCS12 or JKS)
       type: secret
       secret-kind: keystore
-      placeholder: /path/to/keystore.jks
+      placeholder: /path/to/keystore
       visible-if:
         ssl-use-keystore: true
     - name: ssl-keystore-password
@@ -47,10 +51,10 @@ driver:
       visible-if:
         ssl: true
     - name: ssl-truststore
-      display-name: Truststore
+      display-name: Truststore (PKCS12 or JKS)
       type: secret
       secret-kind: keystore
-      placeholder: /path/to/truststore.jks
+      placeholder: /path/to/truststore
       visible-if:
         ssl-use-truststore: true
     - name: ssl-truststore-password
diff --git a/modules/drivers/oracle/resources/metabase-plugin.yaml b/modules/drivers/oracle/resources/metabase-plugin.yaml
index f11d2e02c8525eb7f8ef46a40637f0de33c77005..e56c22dc4d0816ca37a662942931460192186360 100644
--- a/modules/drivers/oracle/resources/metabase-plugin.yaml
+++ b/modules/drivers/oracle/resources/metabase-plugin.yaml
@@ -24,8 +24,12 @@ driver:
     - name: service-name
       display-name: Oracle service name
       placeholder: Optional TNS alias
-    - user
-    - password
+    - merge:
+        - user
+        - required: false
+    - merge:
+        - password
+        - required: false
     - cloud-ip-address-info
     - ssl
     - name: ssl-use-keystore
@@ -34,10 +38,10 @@ driver:
       visible-if:
         ssl: true
     - name: ssl-keystore
-      display-name: Keystore
+      display-name: Keystore (PKCS12 or JKS)
       type: secret
       secret-kind: keystore
-      placeholder: /path/to/keystore.jks
+      placeholder: /path/to/keystore
       visible-if:
         ssl-use-keystore: true
     - name: ssl-keystore-password
@@ -53,10 +57,10 @@ driver:
       visible-if:
         ssl: true
     - name: ssl-truststore
-      display-name: Truststore
+      display-name: Truststore (PKCS12 or JKS)
       type: secret
       secret-kind: keystore
-      placeholder: /path/to/truststore.jks
+      placeholder: /path/to/truststore
       visible-if:
         ssl-use-truststore: true
     - name: ssl-truststore-password