diff --git a/charts/stable/apache-musicindex/questions.yaml b/charts/stable/apache-musicindex/questions.yaml
index 823697de521..364885a4c7c 100644
--- a/charts/stable/apache-musicindex/questions.yaml
+++ b/charts/stable/apache-musicindex/questions.yaml
@@ -102,6 +102,13 @@ questions:
                       schema:
                         type: dict
                         attrs:
+                          - variable: port
+                            label: "Port"
+                            description: "This port exposes the container port on the service"
+                            schema:
+                              type: int
+                              default: 10006
+                              required: true
                           - variable: advanced
                             label: "Show Advanced settings"
                             schema:
@@ -136,13 +143,6 @@ questions:
                                   schema:
                                     type: int
                                     default: 80
-                          - variable: port
-                            label: "Port"
-                            description: "This port exposes the container port on the service"
-                            schema:
-                              type: int
-                              default: 10006
-                              required: true
 
   - variable: serviceexpert
     group: "Networking and Services"
diff --git a/charts/stable/collabora-online/Chart.yaml b/charts/stable/collabora-online/Chart.yaml
index 4ec0c1119a6..ac864137eaf 100644
--- a/charts/stable/collabora-online/Chart.yaml
+++ b/charts/stable/collabora-online/Chart.yaml
@@ -22,7 +22,7 @@ sources:
 - https://sdk.collaboraonline.com/contents.html
 - https://github.com/CollaboraOnline/online/tree/master/kubernetes/helm
 type: application
-version: 10.0.7
+version: 10.0.8
 annotations:
   truecharts.org/catagories: |
     - office
diff --git a/charts/stable/grafana/questions.yaml b/charts/stable/grafana/questions.yaml
index 6044627dc2d..a45fd69d50f 100644
--- a/charts/stable/grafana/questions.yaml
+++ b/charts/stable/grafana/questions.yaml
@@ -143,6 +143,13 @@ questions:
                       schema:
                         type: dict
                         attrs:
+                          - variable: port
+                            label: "Port"
+                            description: "This port exposes the container port on the service"
+                            schema:
+                              type: int
+                              default: 10038
+                              required: true
                           - variable: advanced
                             label: "Show Advanced settings"
                             schema:
@@ -182,13 +189,6 @@ questions:
                                   schema:
                                     type: int
                                     default: 3000
-                          - variable: port
-                            label: "Port"
-                            description: "This port exposes the container port on the service"
-                            schema:
-                              type: int
-                              default: 10038
-                              required: true
 
   - variable: serviceexpert
     group: "Networking and Services"
diff --git a/charts/stable/jackett/questions.yaml b/charts/stable/jackett/questions.yaml
index a1da162f5f1..7f8afc01d5f 100644
--- a/charts/stable/jackett/questions.yaml
+++ b/charts/stable/jackett/questions.yaml
@@ -103,6 +103,13 @@ questions:
                       schema:
                         type: dict
                         attrs:
+                          - variable: port
+                            label: "Port"
+                            description: "This port exposes the container port on the service"
+                            schema:
+                              type: int
+                              default: 9117
+                              required: true
                           - variable: advanced
                             label: "Show Advanced settings"
                             schema:
@@ -142,13 +149,6 @@ questions:
                                   schema:
                                     type: int
                                     default: 9117
-                          - variable: port
-                            label: "Port"
-                            description: "This port exposes the container port on the service"
-                            schema:
-                              type: int
-                              default: 9117
-                              required: true
 
   - variable: serviceexpert
     group: "Networking and Services"
diff --git a/charts/stable/loki/questions.yaml b/charts/stable/loki/questions.yaml
index e44b37ef6eb..6e7c15f10c5 100644
--- a/charts/stable/loki/questions.yaml
+++ b/charts/stable/loki/questions.yaml
@@ -159,6 +159,13 @@ questions:
                       schema:
                         type: dict
                         attrs:
+                          - variable: port
+                            label: "Port"
+                            description: "This port exposes the container port on the service"
+                            schema:
+                              type: int
+                              default: 3100
+                              required: true
                           - variable: advanced
                             label: "Show Advanced settings"
                             schema:
@@ -198,13 +205,6 @@ questions:
                                   schema:
                                     type: int
                                     default: 3100
-                          - variable: port
-                            label: "Port"
-                            description: "This port exposes the container port on the service"
-                            schema:
-                              type: int
-                              default: 3100
-                              required: true
 
   - variable: serviceexpert
     group: "Networking and Services"
diff --git a/charts/stable/oscam/Chart.yaml b/charts/stable/oscam/Chart.yaml
index 923bb4e7043..3199a4e82ed 100644
--- a/charts/stable/oscam/Chart.yaml
+++ b/charts/stable/oscam/Chart.yaml
@@ -19,7 +19,7 @@ name: oscam
 sources:
 - https://trac.streamboard.tv/oscam/browser/trunk
 type: application
-version: 4.0.26
+version: 4.0.27
 annotations:
   truecharts.org/catagories: |
     - DIY
diff --git a/charts/stable/oscam/questions.yaml b/charts/stable/oscam/questions.yaml
index effd05eb2e8..0aacbaf5a13 100644
--- a/charts/stable/oscam/questions.yaml
+++ b/charts/stable/oscam/questions.yaml
@@ -109,6 +109,13 @@ questions:
                       schema:
                         type: dict
                         attrs:
+                          - variable: port
+                            label: "Port"
+                            description: "This port exposes the container port on the service"
+                            schema:
+                              type: int
+                              default: 10062
+                              required: true
                           - variable: advanced
                             label: "Show Advanced settings"
                             schema:
@@ -144,20 +151,6 @@ questions:
                                     type: int
                                     default: 8888
                               required: true
-                          - variable: port
-                            label: "Port"
-                            description: "This port exposes the container port on the service"
-                            schema:
-                              type: int
-                              default: 10062
-                              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: serviceexpert
     group: "Networking and Services"