diff --git a/charts/enterprise/clusterissuer/Chart.yaml b/charts/enterprise/clusterissuer/Chart.yaml
index 539338676e8..ccf49e9bbda 100644
--- a/charts/enterprise/clusterissuer/Chart.yaml
+++ b/charts/enterprise/clusterissuer/Chart.yaml
@@ -1,7 +1,7 @@
 kubeVersion: ">=1.24.0-0"
 apiVersion: v2
 name: clusterissuer
-version: 6.0.0
+version: 6.0.1
 appVersion: latest
 description: Certificate management for Kubernetes
 home: https://truecharts.org/charts/enterprise/clusterissuer
diff --git a/charts/enterprise/clusterissuer/templates/clusterissuer/_CA.tpl b/charts/enterprise/clusterissuer/templates/clusterissuer/_CA.tpl
index 7a4f06e07b5..4867a96380a 100644
--- a/charts/enterprise/clusterissuer/templates/clusterissuer/_CA.tpl
+++ b/charts/enterprise/clusterissuer/templates/clusterissuer/_CA.tpl
@@ -39,8 +39,8 @@ metadata:
   name: {{ .name }}-ca
   namespace: {{ $namespace }}
 data:
-  tls.crt: {{ .crt | b64enc }}
-  tls.key: {{ .key | b64enc }}
+  tls.crt: {{ .crt | replace " " "\n" | b64enc }}
+  tls.key: {{ .key | replace " " "\n" | b64enc }}
 {{- end }}
 ---
 apiVersion: cert-manager.io/v1
diff --git a/charts/stable/external-service/Chart.yaml b/charts/stable/external-service/Chart.yaml
index 21f40997afa..fa9f979f913 100644
--- a/charts/stable/external-service/Chart.yaml
+++ b/charts/stable/external-service/Chart.yaml
@@ -1,7 +1,7 @@
 kubeVersion: ">=1.24.0-0"
 apiVersion: v2
 name: external-service
-version: 12.0.0
+version: 12.0.1
 appVersion: 3.19.0
 description: Allow external services to be used like Apps.
 home: https://truecharts.org/charts/stable/external-service
diff --git a/charts/stable/external-service/questions.yaml b/charts/stable/external-service/questions.yaml
index 0f16cb41c0f..02028690ba5 100644
--- a/charts/stable/external-service/questions.yaml
+++ b/charts/stable/external-service/questions.yaml
@@ -82,68 +82,7 @@ questions:
             additional_attrs: true
             type: dict
             attrs:
-              - variable: enabled
-                label: "Enable Ingress"
-                schema:
-                  type: boolean
-                  default: false
-                  show_subquestions_if: true
-                  subquestions:
-                    - variable: annotations
-                      label: "annotations"
-                      schema:
-                        additional_attrs: true
-                        type: dict
-                        hidden: true
-                        attrs:
-                          - variable: traefik.frontend.passHostHeader
-                            label: "passHostHeader"
-                            schema:
-                              type: string
-                              default: "false"
-                              hidden: true
-                    - variable: hosts
-                      label: "Hosts"
-                      schema:
-                        type: list
-                        default: []
-                        items:
-                          - variable: hostEntry
-                            label: "Host"
-                            schema:
-                              additional_attrs: true
-                              type: dict
-                              attrs:
-                                - variable: host
-                                  label: "HostName"
-                                  schema:
-                                    type: string
-                                    default: ""
-                                    required: true
-                                - variable: paths
-                                  label: "Paths"
-                                  schema:
-                                    type: list
-                                    default: [{path: "/", pathType: "Prefix"}]
-                                    items:
-                                      - variable: pathEntry
-                                        label: "Host"
-                                        schema:
-                                          additional_attrs: true
-                                          type: dict
-                                          attrs:
-                                            - variable: path
-                                              label: "path"
-                                              schema:
-                                                type: string
-                                                required: true
-                                                default: "/"
-                                            - variable: pathType
-                                              label: "pathType"
-                                              schema:
-                                                type: string
-                                                required: true
-                                                default: "Prefix"
+# Include{ingressDefault}
 # Include{ingressTLS}
 # Include{ingressTraefik}
 # Include{ingressAdvanced}
diff --git a/charts/stable/external-service/values.yaml b/charts/stable/external-service/values.yaml
index bfe7154be2d..f31e3e208d6 100644
--- a/charts/stable/external-service/values.yaml
+++ b/charts/stable/external-service/values.yaml
@@ -24,3 +24,8 @@ workload:
 portal:
   open:
     enabled: true
+
+ingress:
+  main:
+    annotations:
+      traefik.frontend.passHostHeader: "false"