diff --git a/charts/incubator/testbed/Chart.yaml b/charts/incubator/testbed/Chart.yaml
index 86fe6a1ecb1..30d8ec3ed71 100644
--- a/charts/incubator/testbed/Chart.yaml
+++ b/charts/incubator/testbed/Chart.yaml
@@ -24,4 +24,4 @@ name: testbed
 sources:
 - https://github.com/Jackett/Jackett
 type: application
-version: 7.0.0
+version: 7.0.1
diff --git a/charts/incubator/testbed/SCALE/questions.yaml b/charts/incubator/testbed/SCALE/questions.yaml
index 05a526d6aee..3b3c43383bf 100644
--- a/charts/incubator/testbed/SCALE/questions.yaml
+++ b/charts/incubator/testbed/SCALE/questions.yaml
@@ -298,6 +298,187 @@ questions:
                               max: 65535
                               default: 36009
 
+  - variable: serviceexpert
+    group: "Advanced"
+    label: "Show Expert Config"
+    schema:
+      type: boolean
+      default: false
+      show_subquestions_if: true
+      subquestions:
+        - variable: hostNetwork
+          group: "Advanced"
+          label: "Host-Networking (Complicated)"
+          schema:
+            type: boolean
+            default: false
+
+        - variable: dnsPolicy
+          group: "Advanced"
+          label: "dnsPolicy"
+          schema:
+            type: string
+            default: ""
+            enum:
+              - value: ""
+                description: "Default"
+              - value: "ClusterFirst"
+                description: "ClusterFirst"
+              - value: "ClusterFirstWithHostNet"
+                description: "ClusterFirstWithHostNet"
+              - value: "None"
+                description: "None"
+
+        - variable: dnsConfig
+          label: "DNS Configuration"
+          group: "Advanced"
+          description: "Specify custom DNS configuration which will be applied to the pod"
+          schema:
+            type: dict
+            attrs:
+              - variable: nameservers
+                label: "Nameservers"
+                schema:
+                  default: []
+                  type: list
+                  items:
+                    - variable: nameserver
+                      label: "Nameserver"
+                      schema:
+                        type: string
+              - variable: options
+                label: "options"
+                schema:
+                  default: []
+                  type: list
+                  items:
+                    - variable: option
+                      label: "Option Entry"
+                      schema:
+                        type: string
+              - variable: searches
+                label: "Searches"
+                schema:
+                  default: []
+                  type: list
+                  items:
+                    - variable: search
+                      label: "Search Entry"
+                      schema:
+                        type: string
+
+
+
+        - variable: serviceList
+          label: "Add Manual Custom Services"
+          group: "Advanced"
+          schema:
+            type: list
+            default: []
+            items:
+              - variable: serviceListEntry
+                label: "Custom Service"
+                schema:
+                  type: dict
+                  attrs:
+                    - variable: enabled
+                      label: "Enable the service"
+                      schema:
+                        type: boolean
+                        default: true
+                        hidden: true
+                    - variable: name
+                      label: "Name"
+                      schema:
+                        type: string
+                        default: ""
+                    - variable: type
+                      label: "Service Type"
+                      description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer"
+                      schema:
+                        type: string
+                        default: "NodePort"
+                        enum:
+                          - value: "NodePort"
+                            description: "NodePort"
+                          - value: "ClusterIP"
+                            description: "ClusterIP"
+                          - value: "LoadBalancer"
+                            description: "LoadBalancer"
+                    - variable: loadBalancerIP
+                      label: "LoadBalancer IP"
+                      description: "LoadBalancerIP"
+                      schema:
+                        show_if: [["type", "=", "LoadBalancer"]]
+                        type: string
+                        default: ""
+                    - variable: externalIPs
+                      label: "External IP's"
+                      description: "External IP's"
+                      schema:
+                        show_if: [["type", "=", "LoadBalancer"]]
+                        type: list
+                        default: []
+                        items:
+                          - variable: externalIP
+                            label: "External IP"
+                            schema:
+                              type: string
+                    - variable: portsList
+                      label: "Additional Service Ports"
+                      schema:
+                        type: list
+                        default: []
+                        items:
+                          - variable: portsListEntry
+                            label: "Custom ports"
+                            schema:
+                              type: dict
+                              attrs:
+                                - variable: enabled
+                                  label: "Enable the port"
+                                  schema:
+                                    type: boolean
+                                    default: true
+                                    hidden: true
+                                - variable: name
+                                  label: "Port Name"
+                                  schema:
+                                    type: string
+                                    default: ""
+                                - variable: protocol
+                                  label: "Port Type"
+                                  schema:
+                                    type: string
+                                    default: "TCP"
+                                    enum:
+                                      - value: HTTP
+                                        description: "HTTP"
+                                      - value: "HTTPS"
+                                        description: "HTTPS"
+                                      - value: TCP
+                                        description: "TCP"
+                                      - value: "UDP"
+                                        description: "UDP"
+                                - variable: targetPort
+                                  label: "Target Port"
+                                  description: "This port exposes the container port on the service"
+                                  schema:
+                                    type: int
+                                    required: true
+                                - variable: port
+                                  label: "Container Port"
+                                  schema:
+                                    type: int
+                                    required: true
+                                - variable: nodePort
+                                  label: "Node Port (Optional)"
+                                  description: "This port gets exposed to the node. Only considered when service type is NodePort"
+                                  schema:
+                                    type: int
+                                    min: 9000
+                                    max: 65535
+
   - variable: persistence
     label: "Integrated Persistent Storage"
     group: "Storage and Persistence"
@@ -1113,176 +1294,7 @@ questions:
                   type: int
                   default: 10
 
-        - variable: dnsPolicy
-          group: "Advanced"
-          label: "dnsPolicy"
-          schema:
-            type: string
-            default: ""
-            enum:
-              - value: ""
-                description: "Default"
-              - value: "ClusterFirst"
-                description: "ClusterFirst"
-              - value: "ClusterFirstWithHostNet"
-                description: "ClusterFirstWithHostNet"
-              - value: "None"
-                description: "None"
 
-        - variable: dnsConfig
-          label: "DNS Configuration"
-          group: "Advanced"
-          description: "Specify custom DNS configuration which will be applied to the pod"
-          schema:
-            type: dict
-            attrs:
-              - variable: nameservers
-                label: "Nameservers"
-                schema:
-                  default: []
-                  type: list
-                  items:
-                    - variable: nameserver
-                      label: "Nameserver"
-                      schema:
-                        type: string
-              - variable: options
-                label: "options"
-                schema:
-                  default: []
-                  type: list
-                  items:
-                    - variable: option
-                      label: "Option Entry"
-                      schema:
-                        type: string
-              - variable: searches
-                label: "Searches"
-                schema:
-                  default: []
-                  type: list
-                  items:
-                    - variable: search
-                      label: "Search Entry"
-                      schema:
-                        type: string
-
-        - variable: hostNetwork
-          group: "Advanced"
-          label: "Host-Networking (Complicated)"
-          schema:
-            type: boolean
-            default: false
-
-        - variable: serviceList
-          label: "Add Manual Custom Services"
-          group: "Advanced"
-          schema:
-            type: list
-            default: []
-            items:
-              - variable: serviceListEntry
-                label: "Custom Service"
-                schema:
-                  type: dict
-                  attrs:
-                    - variable: enabled
-                      label: "Enable the service"
-                      schema:
-                        type: boolean
-                        default: true
-                        hidden: true
-                    - variable: name
-                      label: "Name"
-                      schema:
-                        type: string
-                        default: ""
-                    - variable: type
-                      label: "Service Type"
-                      description: "ClusterIP's are only internally available, nodePorts expose the container to the host node System, Loadbalancer exposes the service using the system loadbalancer"
-                      schema:
-                        type: string
-                        default: "NodePort"
-                        enum:
-                          - value: "NodePort"
-                            description: "NodePort"
-                          - value: "ClusterIP"
-                            description: "ClusterIP"
-                          - value: "LoadBalancer"
-                            description: "LoadBalancer"
-                    - variable: loadBalancerIP
-                      label: "LoadBalancer IP"
-                      description: "LoadBalancerIP"
-                      schema:
-                        show_if: [["type", "=", "LoadBalancer"]]
-                        type: string
-                        default: ""
-                    - variable: externalIPs
-                      label: "External IP's"
-                      description: "External IP's"
-                      schema:
-                        show_if: [["type", "=", "LoadBalancer"]]
-                        type: list
-                        default: []
-                        items:
-                          - variable: externalIP
-                            label: "External IP"
-                            schema:
-                              type: string
-                    - variable: portsList
-                      label: "Additional Service Ports"
-                      schema:
-                        type: list
-                        default: []
-                        items:
-                          - variable: portsListEntry
-                            label: "Custom ports"
-                            schema:
-                              type: dict
-                              attrs:
-                                - variable: enabled
-                                  label: "Enable the port"
-                                  schema:
-                                    type: boolean
-                                    default: true
-                                    hidden: true
-                                - variable: name
-                                  label: "Port Name"
-                                  schema:
-                                    type: string
-                                    default: ""
-                                - variable: protocol
-                                  label: "Port Type"
-                                  schema:
-                                    type: string
-                                    default: "TCP"
-                                    enum:
-                                      - value: HTTP
-                                        description: "HTTP"
-                                      - value: "HTTPS"
-                                        description: "HTTPS"
-                                      - value: TCP
-                                        description: "TCP"
-                                      - value: "UDP"
-                                        description: "UDP"
-                                - variable: targetPort
-                                  label: "Target Port"
-                                  description: "This port exposes the container port on the service"
-                                  schema:
-                                    type: int
-                                    required: true
-                                - variable: port
-                                  label: "Container Port"
-                                  schema:
-                                    type: int
-                                    required: true
-                                - variable: nodePort
-                                  label: "Node Port (Optional)"
-                                  description: "This port gets exposed to the node. Only considered when service type is NodePort"
-                                  schema:
-                                    type: int
-                                    min: 9000
-                                    max: 65535