diff --git a/test/ipfs/1.0.1/questions.yaml b/test/ipfs/1.0.1/questions.yaml
index 02d188240f..676cc1a7e3 100644
--- a/test/ipfs/1.0.1/questions.yaml
+++ b/test/ipfs/1.0.1/questions.yaml
@@ -121,75 +121,79 @@ questions:
             default: 9880
             required: true
 
-
-  - variable: ipfsDataHostPathEnabled
-    label: "Configure Host Path for IPFS data"
-    group: "Storage"
-    schema:
-      type: boolean
-      default: false
-      show_subquestions_if: true
-      subquestions:
-        - variable: ipfsDataHostPath
-          label: "Specify HostPath for IPFS data"
-          schema:
-            type: hostpath
-
-  - variable: ipfsDataVolume
-    label: "IPFS Data Volume Defaults"
+  - variable: appVolumeMounts
+    label: "IPFS Storage"
     group: "Storage"
     schema:
       type: dict
-      $ref:
-        - "normalize/ixVolume"
-      show_if: [["ipfsDataHostPathEnabled", "=", false]]
       attrs:
-        - variable: mountPath
-          label: "Mount Path"
-          description: "Path where the volume will be mounted inside the pod"
+        - variable: staging
+          label: "Staging Volume"
           schema:
-            type: path
-            editable: false
-            default: "/data/ipfs"
-        - variable: datasetName
-          label: "IPFS Data Dataset Name"
+            type: dict
+            $ref:
+              - "normalize/ixVolume"
+            attrs:
+              - variable: datasetName
+                label: "IPFS Staging Volume Dataset Name"
+                schema:
+                  type: string
+                  $ref:
+                    - "normalize/ixVolume"
+                  show_if: [["hostPathEnabled", "=", false ]]
+                  default: "ix-ipfs-staging"
+                  editable: false
+              - variable: mountPath
+                label: "Mount Path"
+                description: "Path where the volume will be mounted inside the pod"
+                schema:
+                  type: path
+                  editable: false
+                  default: "/export"
+              - variable: hostPathEnabled
+                label: "host Path Enabled"
+                schema:
+                  type: boolean
+                  default: false
+                  show_subquestions_if: true
+                  subquestions:
+                    - variable: hostPath
+                      label: "Host Path"
+                      schema:
+                        type: hostpath
+                        required: true
+        - variable: data
+          label: "Data Volume"
           schema:
-            type: string
-            default: "ix-ipfs-data"
-            editable: false
-
-  - variable: ipfsStagingHostPathEnabled
-    label: "Configure Host Path for IPFS staging data"
-    group: "Storage"
-    schema:
-      type: boolean
-      default: false
-      show_subquestions_if: true
-      subquestions:
-        - variable: ipfsStagingHostPath
-          label: "Specify HostPath for IPFS staging data"
-          schema:
-            type: hostpath
-
-  - variable: ipfsStagingVolume
-    label: "IPFS Staging Volume Defaults"
-    group: "Storage"
-    schema:
-      type: dict
-      $ref:
-        - "normalize/ixVolume"
-      show_if: [["ipfsStagingHostPathEnabled", "=", false]]
-      attrs:
-        - variable: mountPath
-          label: "Mount Path"
-          description: "Path where the volume will be mounted inside the pod"
-          schema:
-            type: path
-            editable: false
-            default: "/export"
-        - variable: datasetName
-          label: "IPFS Staging Dataset Name"
-          schema:
-            type: string
-            default: "ix-ipfs-staging"
-            editable: false
+            type: dict
+            $ref:
+              - "normalize/ixVolume"
+            attrs:
+              - variable: datasetName
+                label: "IPFS Data Volume Dataset Name"
+                schema:
+                  type: string
+                  $ref:
+                    - "normalize/ixVolume"
+                  show_if: [["hostPathEnabled", "=", false]]
+                  default: "ix-ipfs-data"
+                  editable: false
+              - variable: mountPath
+                label: "Mount Path"
+                description: "Path where the volume will be mounted inside the pod"
+                schema:
+                  type: path
+                  editable: false
+                  default: "/data/ipfs"
+              - variable: hostPathEnabled
+                label: "host Path Enabled"
+                schema:
+                  type: boolean
+                  default: false
+                  show_subquestions_if: true
+                  subquestions:
+                    - variable: hostPath
+                      label: "Host Path"
+                      schema:
+                        type: hostpath
+                        required: true