diff --git a/templates/questions/general/podOptions.yaml b/templates/questions/general/podOptions.yaml
index a1b917ee2fb..d7dbeceb227 100644
--- a/templates/questions/general/podOptions.yaml
+++ b/templates/questions/general/podOptions.yaml
@@ -5,57 +5,64 @@
       additional_attrs: true
       type: dict
       attrs:
-        - variable: hostNetwork
-          label: "Host Networking"
+        - variable: expertPodOpts
+          label: "Expert - Pod Options"
           schema:
             type: boolean
             default: false
-        - variable: dnsConfig
-          label: "DNS Configuration"
-          schema:
-            type: dict
-            additional_attrs: true
-            attrs:
-              - variable: options
-                label: "Options"
+            show_subquestions_if: true
+            subquestions:
+              - variable: hostNetwork
+                label: "Host Networking"
                 schema:
-                  type: list
-                  default: [{"name": "ndots", "value": "2"}]
-                  items:
-                    - variable: optionsEntry
-                      label: "Option Entry"
+                  type: boolean
+                  default: false
+              - variable: dnsConfig
+                label: "DNS Configuration"
+                schema:
+                  type: dict
+                  additional_attrs: true
+                  attrs:
+                    - variable: options
+                      label: "Options"
                       schema:
-                        type: dict
-                        additional_attrs: true
-                        attrs:
-                          - variable: name
-                            label: "Name"
+                        type: list
+                        default: [{"name": "ndots", "value": "2"}]
+                        items:
+                          - variable: optionsEntry
+                            label: "Option Entry"
+                            schema:
+                              type: dict
+                              additional_attrs: true
+                              attrs:
+                                - variable: name
+                                  label: "Name"
+                                  schema:
+                                    type: string
+                                    required: true
+                                - variable: value
+                                  label: "Value"
+                                  schema:
+                                    type: string
+                    - variable: nameservers
+                      label: "Nameservers"
+                      schema:
+                        type: list
+                        default: []
+                        items:
+                          - variable: nsEntry
+                            label: "Nameserver Entry"
                             schema:
                               type: string
                               required: true
-                          - variable: value
-                            label: "Value"
+                    - variable: searches
+                      label: "Searches"
+                      schema:
+                        type: list
+                        default: []
+                        items:
+                          - variable: searchEntry
+                            label: "Search Entry"
                             schema:
                               type: string
-              - variable: nameservers
-                label: "Nameservers"
-                schema:
-                  type: list
-                  default: []
-                  items:
-                    - variable: nsEntry
-                      label: "Nameserver Entry"
-                      schema:
-                        type: string
-                        required: true
-              - variable: searches
-                label: "Searches"
-                schema:
-                  type: list
-                  default: []
-                  items:
-                    - variable: searchEntry
-                      label: "Search Entry"
-                      schema:
-                        type: string
-                        required: true
+                              required: true