diff --git a/charts/stable/jackett/Chart.yaml b/charts/stable/jackett/Chart.yaml
index 9bb03d9d642..5f2e8e98785 100644
--- a/charts/stable/jackett/Chart.yaml
+++ b/charts/stable/jackett/Chart.yaml
@@ -22,7 +22,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/jackett
   - https://github.com/Jackett/Jackett
 type: application
-version: 13.0.36
+version: 13.0.37
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/templates/questions/ingress/ingressDefault.yaml b/templates/questions/ingress/ingressDefault.yaml
index 812c95b378b..74988ce81d2 100644
--- a/templates/questions/ingress/ingressDefault.yaml
+++ b/templates/questions/ingress/ingressDefault.yaml
@@ -5,6 +5,12 @@
                   default: false
                   show_subquestions_if: true
                   subquestions:
+                    - variable: clusterIssuer
+                      label: clusterIssuer
+                      description: 'add the name of your cert-manager clusterIssuer here for automatic tls certificates. Cannot be used combined with tls option below'
+                      schema:
+                        type: string
+                        default: ""
                     - variable: hosts
                       label: Hosts
                       schema:
diff --git a/templates/questions/ingress/ingressList.yaml b/templates/questions/ingress/ingressList.yaml
index 2b8fce021aa..6c68a7b14b7 100644
--- a/templates/questions/ingress/ingressList.yaml
+++ b/templates/questions/ingress/ingressList.yaml
@@ -27,6 +27,12 @@
                 schema:
                   type: string
                   default: ""
+              - variable: clusterIssuer
+                label: clusterIssuer
+                description: 'add the name of your cert-manager clusterIssuer here for automatic tls certificates. Cannot be used combined with tls option below'
+                schema:
+                  type: string
+                  default: ""
               - variable: hosts
                 label: Hosts
                 schema:
@@ -89,6 +95,7 @@
                 schema:
                   type: list
                   default: []
+                  show_if: [["clusterIssuer", "=", ""]]
                   items:
                     - variable: tlsEntry
                       label: Host
@@ -108,12 +115,25 @@
                                     type: string
                                     default: ""
                                     required: true
-                          - variable: scaleCert
-                            label: Select TrueNAS SCALE Certificate
+                          - variable: clusterIssuer
+                            label: Use Cert-Manager clusterIssuer
+                            description: 'add the name of your Cert-Manager clusterIssuer here for automatic tls certificates.'
                             schema:
+                              type: string
+                              default: ""
+                          - variable: scaleCert
+                            label: Use TrueNAS SCALE Certificate (Deprecated)
+                            schema:
+                              show_if: [["clusterIssuer", "=", ""]]
                               type: int
                               $ref:
                                 - "definitions/certificate"
+                          - variable: secretName
+                            label: Use Custom Secret (Advanced)
+                            schema:
+                              type: string
+                              show_if: [["clusterIssuer", "=", ""]]
+                              default: ""
               - variable: entrypoint
                 label: Traefik Entrypoint
                 description: Entrypoint used by Traefik when using Traefik as Ingress Provider
diff --git a/templates/questions/ingress/ingressTLS.yaml b/templates/questions/ingress/ingressTLS.yaml
index 41ecdd7e8b7..60cf5bfe8ce 100644
--- a/templates/questions/ingress/ingressTLS.yaml
+++ b/templates/questions/ingress/ingressTLS.yaml
@@ -2,6 +2,7 @@
                       label: TLS-Settings
                       schema:
                         type: list
+                        show_if: [["clusterIssuer", "=", ""]]
                         default: []
                         items:
                           - variable: tlsEntry
@@ -22,9 +23,23 @@
                                           type: string
                                           default: ""
                                           required: true
-                                - variable: scaleCert
-                                  label: Select TrueNAS SCALE Certificate
+                                          
+                                - variable: clusterIssuer
+                                  label: Use Cert-Manager clusterIssuer
+                                  description: 'add the name of your cert-manager clusterIssuer here for automatic tls certificates.'
                                   schema:
+                                    type: string
+                                    default: ""
+                                - variable: scaleCert
+                                  label: Use TrueNAS SCALE Certificate (Deprecated)
+                                  schema:
+                                    show_if: [["clusterIssuer", "=", ""]]
                                     type: int
                                     $ref:
                                       - "definitions/certificate"
+                                - variable: secretName
+                                  label: Use Custom Secret (Advanced)
+                                  schema:
+                                    show_if: [["clusterIssuer", "=", ""]]
+                                    type: string
+                                    default: ""