diff --git a/templates/questions/service/serviceExpert.yaml b/templates/questions/service/serviceExpert.yaml
index e6a1532ddef..b0551a1321d 100644
--- a/templates/questions/service/serviceExpert.yaml
+++ b/templates/questions/service/serviceExpert.yaml
@@ -39,38 +39,38 @@
                                   description: Use DHCP
                                 - value: static
                                   description: Use Static IP
-                              show_subquestions_if: static
-                              subquestions:
-                                - variable: staticIPConfigurations
-                                  label: Static IP Addresses
+                    - variable: staticIPConfigurations
+                      label: Static IP Addresses
+                      schema:
+                        type: list
+                        show_if: [["ipam", "=", {"type": "static"}]]
+                        items:
+                          - variable: staticIP
+                            label: Static IP
+                            schema:
+                              type: ipaddr
+                              cidr: true
+                    - variable: staticRoutes
+                      label: Static Routes
+                      schema:
+                        type: list
+                        show_if: [["ipam", "=", {"type": "static"}]]
+                        items:
+                          - variable: staticRouteConfiguration
+                            label: Static Route Configuration
+                            schema:
+                              additional_attrs: true
+                              type: dict
+                              attrs:
+                                - variable: destination
+                                  label: Destination
                                   schema:
-                                    type: list
-                                    items:
-                                      - variable: staticIP
-                                        label: Static IP
-                                        schema:
-                                          type: ipaddr
-                                          cidr: true
-                                - variable: staticRoutes
-                                  label: Static Routes
+                                    type: ipaddr
+                                    cidr: true
+                                    required: true
+                                - variable: gateway
+                                  label: Gateway
                                   schema:
-                                    type: list
-                                    items:
-                                      - variable: staticRouteConfiguration
-                                        label: Static Route Configuration
-                                        schema:
-                                          additional_attrs: true
-                                          type: dict
-                                          attrs:
-                                            - variable: destination
-                                              label: Destination
-                                              schema:
-                                                type: ipaddr
-                                                cidr: true
-                                                required: true
-                                            - variable: gateway
-                                              label: Gateway
-                                              schema:
-                                                type: ipaddr
-                                                cidr: false
-                                                required: true
+                                    type: ipaddr
+                                    cidr: false
+                                    required: true