diff --git a/charts/stable/jackett/Chart.yaml b/charts/stable/jackett/Chart.yaml
index 3bd8cab2e19..10666b51247 100644
--- a/charts/stable/jackett/Chart.yaml
+++ b/charts/stable/jackett/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: "0.19.124"
 dependencies:
 - name: common
   repository: https://truecharts.org
-  version: 8.3.19
+  version: 8.4.0
 deprecated: false
 description: API Support for your favorite torrent trackers.
 home: https://github.com/truecharts/apps/tree/master/charts/stable/jackett
@@ -24,7 +24,7 @@ name: jackett
 sources:
 - https://github.com/Jackett/Jackett
 type: application
-version: 9.0.6
+version: 9.0.7
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/stable/jackett/questions.yaml b/charts/stable/jackett/questions.yaml
index edc98060442..62df2d1cb0a 100644
--- a/charts/stable/jackett/questions.yaml
+++ b/charts/stable/jackett/questions.yaml
@@ -24,47 +24,55 @@ questions:
             type: boolean
             default: true
 # Include{global}
+
   - variable: controller
     group: "Controller"
     label: ""
     schema:
       type: dict
       attrs:
-        - variable: type
-          description: "Please specify type of workload to deploy"
-          label: "(Advanced) Controller Type"
+        - variable: advanced
+          label: "Show Advanced Controller Settings"
           schema:
-            type: string
-            default: "deployment"
-            required: true
-            enum:
-              - value: "deployment"
-                description: "Deployment"
-              - value: "statefulset"
-                description: "Statefulset"
-              - value: "daemonset"
-                description: "Daemonset"
-        - variable: replicas
-          description: "Number of desired pod replicas"
-          label: "Desired Replicas"
-          schema:
-            type: int
-            default: 1
-            required: true
-        - variable: strategy
-          description: "Please specify type of workload to deploy"
-          label: "(Advanced) Update Strategy"
-          schema:
-            type: string
-            default: "Recreate"
-            required: true
-            enum:
-              - value: "Recreate"
-                description: "Recreate: Kill existing pods before creating new ones"
-              - value: "RollingUpdate"
-                description: "RollingUpdate: Create new pods and then kill old ones"
-              - value: "OnDelete"
-                description: "(Legacy) OnDelete: ignore .spec.template changes"
+            type: boolean
+            default: false
+            show_subquestions_if: true
+            subquestions:
+              - variable: type
+                description: "Please specify type of workload to deploy"
+                label: "(Advanced) Controller Type"
+                schema:
+                  type: string
+                  default: "deployment"
+                  required: true
+                  enum:
+                    - value: "deployment"
+                      description: "Deployment"
+                    - value: "statefulset"
+                      description: "Statefulset"
+                    - value: "daemonset"
+                      description: "Daemonset"
+              - variable: replicas
+                description: "Number of desired pod replicas"
+                label: "Desired Replicas"
+                schema:
+                  type: int
+                  default: 1
+                  required: true
+              - variable: strategy
+                description: "Please specify type of workload to deploy"
+                label: "(Advanced) Update Strategy"
+                schema:
+                  type: string
+                  default: "Recreate"
+                  required: true
+                  enum:
+                    - value: "Recreate"
+                      description: "Recreate: Kill existing pods before creating new ones"
+                    - value: "RollingUpdate"
+                      description: "RollingUpdate: Create new pods and then kill old ones"
+                    - value: "OnDelete"
+                      description: "(Legacy) OnDelete: ignore .spec.template changes"
 # Include{controllerExpert}
 
   - variable: env
@@ -89,97 +97,57 @@ questions:
           schema:
             type: dict
             attrs:
-              - variable: enabled
-                label: "Enable the service"
-                schema:
-                  type: boolean
-                  default: true
-                  hidden: true
-              - 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: ports
-                label: "Service's Port(s) Configuration"
-                schema:
-                  type: dict
-                  attrs:
+# Include{serviceselector}
                     - variable: main
                       label: "Main Service Port Configuration"
                       schema:
                         type: dict
                         attrs:
-                          - variable: enabled
-                            label: "Enable the port"
+                          - variable: advanced
+                            label: "Show Advanced settings"
                             schema:
                               type: boolean
-                              default: true
-                              hidden: true
-                          - variable: protocol
-                            label: "Port Type"
-                            schema:
-                              type: string
-                              default: "HTTP"
-                              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
-                              default: 9117
-                              editable: false
-                              hidden: true
+                              default: false
+                              show_subquestions_if: true
+                              subquestions:
+                                - variable: enabled
+                                  label: "Enable the port"
+                                  schema:
+                                    type: boolean
+                                    default: true
+                                - variable: protocol
+                                  label: "Port Type"
+                                  schema:
+                                    type: string
+                                    default: "HTTP"
+                                    enum:
+                                      - value: HTTP
+                                        description: "HTTP"
+                                      - value: "HTTPS"
+                                        description: "HTTPS"
+                                      - value: TCP
+                                        description: "TCP"
+                                      - value: "UDP"
+                                        description: "UDP"
+                                - variable: nodePort
+                                  label: "Node Port (Optional)"
+                                  description: "This port gets exposed to the node. Only considered when service type is NodePort, Simple or LoadBalancer"
+                                  schema:
+                                    type: int
+                                    min: 9000
+                                    max: 65535
+                                - variable: targetPort
+                                  label: "Target Port"
+                                  description: "The internal(!) port on the container the Application runs on"
+                                  schema:
+                                    type: int
+                                    default: 9117
                           - variable: port
-                            label: "Container Port"
+                            label: "This port exposes the container port on the service"
                             schema:
                               type: int
                               default: 9117
-                              editable: true
                               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
-                              default: 36009
 
   - variable: serviceexpert
     group: "Networking and Services"
@@ -379,32 +347,39 @@ questions:
 
 # Include{ingressList}
 
-  - variable: securityContext
+  - variable: advancedSecurity
+    label: "Show Advanced Security Settings"
     group: "Security and Permissions"
-    label: "Security Context"
     schema:
-      type: dict
-      attrs:
-        - variable: privileged
-          label: "Privileged mode"
+      type: boolean
+      default: false
+      show_subquestions_if: true
+      subquestions:
+        - variable: securityContext
+          label: "Security Context"
           schema:
-            type: boolean
-            default: false
-        - variable: readOnlyRootFilesystem
-          label: "ReadOnly Root Filesystem"
-          schema:
-            type: boolean
-            default: false
-        - variable: allowPrivilegeEscalation
-          label: "Allow Privilege Escalation"
-          schema:
-            type: boolean
-            default: false
-        - variable: runAsNonRoot
-          label: "runAsNonRoot"
-          schema:
-            type: boolean
-            default: true
+            type: dict
+            attrs:
+              - variable: privileged
+                label: "Privileged mode"
+                schema:
+                  type: boolean
+                  default: false
+              - variable: readOnlyRootFilesystem
+                label: "ReadOnly Root Filesystem"
+                schema:
+                  type: boolean
+                  default: false
+              - variable: allowPrivilegeEscalation
+                label: "Allow Privilege Escalation"
+                schema:
+                  type: boolean
+                  default: false
+              - variable: runAsNonRoot
+                label: "runAsNonRoot"
+                schema:
+                  type: boolean
+                  default: true
 
   - variable: podSecurityContext
     group: "Security and Permissions"
diff --git a/charts/stable/jackett/values.yaml b/charts/stable/jackett/values.yaml
index 4b0ed038228..39476bc054f 100644
--- a/charts/stable/jackett/values.yaml
+++ b/charts/stable/jackett/values.yaml
@@ -11,8 +11,10 @@ securityContext:
 service:
   main:
     enabled: true
+    protocol: "HTTP"
     ports:
       main:
+        targetPort: 9117
         port: 9117
 
 probes:
diff --git a/templates/questions/controllerExpert.yaml b/templates/questions/controllerExpert.yaml
index b56e05e6449..3f3a75a4370 100644
--- a/templates/questions/controllerExpert.yaml
+++ b/templates/questions/controllerExpert.yaml
@@ -1,64 +1,64 @@
-        - variable: advanced
-          label: "Show Expert Configuration Options"
-          schema:
-            type: boolean
-            default: false
-            show_subquestions_if: true
-            subquestions:
-              - variable: extraArgs
-                label: "Extra Args"
+              - variable: advanced
+                label: "Show Expert Configuration Options"
                 schema:
-                  type: list
-                  default: []
-                  items:
-                    - variable: argItem
-                      label: "Arg"
+                  type: boolean
+                  default: false
+                  show_subquestions_if: true
+                  subquestions:
+                    - variable: extraArgs
+                      label: "Extra Args"
                       schema:
-                        type: dict
-                        attrs:
-                          - variable: name
-                            label: "Name"
+                        type: list
+                        default: []
+                        items:
+                          - variable: argItem
+                            label: "Arg"
                             schema:
-                              type: string
-                          - variable: value
-                            label: "Value"
-                            schema:
-                              type: string
-              - variable: labelsList
-                label: "Controller Labels"
-                schema:
-                  type: list
-                  default: []
-                  items:
-                    - variable: labelItem
-                      label: "Label"
+                              type: dict
+                              attrs:
+                                - variable: name
+                                  label: "Name"
+                                  schema:
+                                    type: string
+                                - variable: value
+                                  label: "Value"
+                                  schema:
+                                    type: string
+                    - variable: labelsList
+                      label: "Controller Labels"
                       schema:
-                        type: dict
-                        attrs:
-                          - variable: name
-                            label: "Name"
+                        type: list
+                        default: []
+                        items:
+                          - variable: labelItem
+                            label: "Label"
                             schema:
-                              type: string
-                          - variable: value
-                            label: "Value"
-                            schema:
-                              type: string
-              - variable: annotationsList
-                label: " Controller Annotations"
-                schema:
-                  type: list
-                  default: []
-                  items:
-                    - variable: annotationItem
-                      label: "Label"
+                              type: dict
+                              attrs:
+                                - variable: name
+                                  label: "Name"
+                                  schema:
+                                    type: string
+                                - variable: value
+                                  label: "Value"
+                                  schema:
+                                    type: string
+                    - variable: annotationsList
+                      label: " Controller Annotations"
                       schema:
-                        type: dict
-                        attrs:
-                          - variable: name
-                            label: "Name"
+                        type: list
+                        default: []
+                        items:
+                          - variable: annotationItem
+                            label: "Label"
                             schema:
-                              type: string
-                          - variable: value
-                            label: "Value"
-                            schema:
-                              type: string
+                              type: dict
+                              attrs:
+                                - variable: name
+                                  label: "Name"
+                                  schema:
+                                    type: string
+                                - variable: value
+                                  label: "Value"
+                                  schema:
+                                    type: string