diff --git a/charts/app-config-frontend/README.md b/charts/app-config-frontend/README.md
index bfa7fad2..8cf9fc7f 100644
--- a/charts/app-config-frontend/README.md
+++ b/charts/app-config-frontend/README.md
@@ -44,7 +44,6 @@ A Helm chart for the frontend application of RADAR-base application config (app-
 | image.digest | string | `""` | Image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag |
 | image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
 | image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. Secrets must be manually created in the namespace. e.g: pullSecrets:   - myRegistryKeySecretName |
-| imagePullSecrets | list | `[]` | Docker registry secret names as an array |
 | nameOverride | string | `""` | String to partially override app-config-frontend.fullname template with a string (will prepend the release name) |
 | fullnameOverride | string | `""` | String to fully override app-config-frontend.fullname template with a string |
 | podAnnotations | object | `{}` | Annotations for Appconfig frontend pods |
diff --git a/charts/app-config-frontend/templates/_helpers.tpl b/charts/app-config-frontend/templates/_helpers.tpl
index db44308e..060794c1 100644
--- a/charts/app-config-frontend/templates/_helpers.tpl
+++ b/charts/app-config-frontend/templates/_helpers.tpl
@@ -5,7 +5,6 @@ Expand the name of the chart.
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
-
 {{/*
 Return the proper image name
 */}}
diff --git a/charts/app-config-frontend/values.yaml b/charts/app-config-frontend/values.yaml
index ce95b61d..2e158725 100644
--- a/charts/app-config-frontend/values.yaml
+++ b/charts/app-config-frontend/values.yaml
@@ -25,10 +25,6 @@ image:
   #
   pullSecrets: []
 
-
-# -- Docker registry secret names as an array
-imagePullSecrets: []
-
 # -- String to partially override app-config-frontend.fullname template with a string (will prepend the release name)
 nameOverride: ""
 # -- String to fully override app-config-frontend.fullname template with a string
diff --git a/charts/data-dashboard-backend/templates/ingress.yaml b/charts/data-dashboard-backend/templates/ingress.yaml
index 15cc6c07..e470f935 100644
--- a/charts/data-dashboard-backend/templates/ingress.yaml
+++ b/charts/data-dashboard-backend/templates/ingress.yaml
@@ -18,17 +18,16 @@ metadata:
     {{- $annotations := include "common.tplvalues.merge" ( dict "values" ( list .Values.ingress.annotations .Values.commonAnnotations ) "context" . ) }}
     {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
     {{- end }}
-  {{- end }}
 spec:
   ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
-  {{- if and .Values.ingress.tls (not .Values.disable_tls) }}
+{{- if and .Values.ingress.tls (not .Values.disable_tls) }}
   tls:
     - hosts:
-        {{- range .Values.ingress.hosts }}
+      {{- range $hosts }}
         - {{ . | quote }}
-        {{- end }}
+      {{- end }}
       secretName: {{ .Values.ingress.tls.secretName }}
-  {{- end }}
+{{- end }}
   rules:
   {{- range .Values.ingress.hosts }}
     - host: {{ . | quote }}
diff --git a/charts/management-portal/templates/_helpers.tpl b/charts/management-portal/templates/_helpers.tpl
index 41feb50a..19dd941a 100644
--- a/charts/management-portal/templates/_helpers.tpl
+++ b/charts/management-portal/templates/_helpers.tpl
@@ -6,6 +6,20 @@ Expand the name of the chart.
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
+{{/*
+Return the proper image name
+*/}}
+{{- define "management-portal.image" -}}
+{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global "chart" .Chart ) }}
+{{- end -}}
+
+{{/*
+Return the proper Docker Image Registry Secret Names
+*/}}
+{{- define "management-portal.imagePullSecrets" -}}
+{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}}
+{{- end -}}
+
 {{/*
 Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
diff --git a/charts/radar-self-enrolment-ui/templates/ingress.yaml b/charts/radar-self-enrolment-ui/templates/ingress.yaml
index e7be0b8a..e470f935 100644
--- a/charts/radar-self-enrolment-ui/templates/ingress.yaml
+++ b/charts/radar-self-enrolment-ui/templates/ingress.yaml
@@ -1,8 +1,12 @@
 {{- if .Values.ingress.enabled -}}
+{{- $path := .Values.ingress.path -}}
+{{- $hosts := .Values.ingress.hosts -}}
+{{- $svcPort := .Values.service.port -}}
+{{- $pathType := .Values.ingress.pathType -}}
 {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
 apiVersion: networking.k8s.io/v1
 {{- else -}}
-apiVersion: networking.k8s.io/v1beta1
+apiVersion: extensions/v1beta1
 {{- end }}
 kind: Ingress
 metadata:
@@ -15,27 +19,24 @@ metadata:
     {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }}
     {{- end }}
 spec:
-  ingressClassName: {{ .Values.ingress.className }}
-  {{- if .Values.ingress.tls }}
+  ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
+{{- if and .Values.ingress.tls (not .Values.disable_tls) }}
   tls:
-    {{- range .Values.ingress.tls }}
     - hosts:
-        {{- range .hosts }}
+      {{- range $hosts }}
         - {{ . | quote }}
-        {{- end }}
-      secretName: {{ .secretName }}
-    {{- end }}
-  {{- end }}
+      {{- end }}
+      secretName: {{ .Values.ingress.tls.secretName }}
+{{- end }}
   rules:
-    {{- range .Values.ingress.hosts }}
-    - host: {{ .host | quote }}
+  {{- range .Values.ingress.hosts }}
+    - host: {{ . | quote }}
       http:
         paths:
-          {{- range .paths }}
-          - path: {{ .path }}
-            {{- if .pathType }}
-            pathType: {{ .pathType }}
+          - path: {{ $path | quote }}
+            {{- if and $pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
+            pathType: {{ $pathType }}
             {{- end }}
             backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }}
-    {{- end }}
+  {{- end }}
 {{- end }}