diff --git a/system/openebs/5.1.1/questions.yaml b/system/openebs/5.1.1/questions.yaml
index 7024fdd2d67..73be071f4e5 100755
--- a/system/openebs/5.1.1/questions.yaml
+++ b/system/openebs/5.1.1/questions.yaml
@@ -177,78 +177,6 @@ questions:
             type: boolean
             default: false
 
-  - variable: credentialsList
-    group: General
-    label: "Credentials (Experimental)"
-    schema:
-      type: list
-      default: []
-      items:
-        - variable: credentialsEntry
-          label: "Enter Credentials"
-          schema:
-            additional_attrs: true
-            type: dict
-            attrs:
-              - variable: name
-                label: Name
-                description: "Name"
-                schema:
-                  type: string
-                  required: true
-                  default: ""
-              - variable: type
-                label: Type
-                description: "Type of Credential"
-                schema:
-                  type: string
-                  default: "s3"
-                  enum:
-                    - value: s3
-                      description: s3 Storage
-              - variable: url
-                label: "url"
-                schema:
-                  type: string
-                  default: ""
-                  required: true
-              - variable: path
-                label: "path"
-                description: "Path Prefix not needed for most cases"
-                schema:
-                  type: string
-                  default: ""
-              - variable: bucket
-                label: "bucket"
-                schema:
-                  show_if: [["type", "=", "s3"]]
-                  type: string
-                  default: ""
-                  required: true
-              - variable: accessKey
-                label: "accessKey"
-                schema:
-                  show_if: [["type", "=", "s3"]]
-                  type: string
-                  default: ""
-                  required: true
-              - variable: secretKey
-                label: "secretKey"
-                schema:
-                  show_if: [["type", "=", "s3"]]
-                  type: string
-                  default: ""
-                  required: true
-              - variable: encrKey
-                label: "encrKey"
-                description: "The Encryption key is needed for tools like volsync if not needed it will be ignored"
-                schema:
-                  show_if: [["type", "=", "s3"]]
-                  type: string
-                  default: "MYSECRETPASSPHRASE"
-                  required: true
-
-
 
   - variable: zfs-localpv
     group: "App Configuration"
@@ -402,14 +330,12 @@ questions:
     schema:
       type: dict
       additional_attrs: true
-      hidden: true
       attrs:
         - variable: zfspv
           label: "ZFS-LocalPV volumeSnapshotClass"
           schema:
             type: dict
             additional_attrs: true
-            hidden: true
             attrs:
               - variable: enabled
                 label: "enabled"