diff --git a/charts/enterprise/kubeapps/Chart.yaml b/charts/enterprise/kubeapps/Chart.yaml
index 92a46737019..69d48bd9972 100644
--- a/charts/enterprise/kubeapps/Chart.yaml
+++ b/charts/enterprise/kubeapps/Chart.yaml
@@ -42,4 +42,4 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/enterprise/kubeapps
   - https://ghcr.io/xstar97/my-proxy-service
 type: application
-version: 2.1.5
+version: 2.1.6
diff --git a/charts/enterprise/kubeapps/templates/common.yaml b/charts/enterprise/kubeapps/templates/common.yaml
index 995efb03eb0..ce76c355e2b 100644
--- a/charts/enterprise/kubeapps/templates/common.yaml
+++ b/charts/enterprise/kubeapps/templates/common.yaml
@@ -1,5 +1,19 @@
 {{/* Make sure all variables are set properly */}}
 {{- include "tc.v1.common.loader.init" . }}
 
+{{- $overrideService := dict "name" "tckubeapps" "port" 8080 "expandObjectName" false -}}
+{{- $hosts := list -}}
+{{- range $.Values.ingress.main.hosts -}}
+  {{- $paths := list -}}
+  {{- range .paths -}}
+    {{- $path := dict "path" .path "pathType" .pathType "overrideService" $overrideService -}}
+    {{- $paths = append $paths $path -}}
+  {{- end -}}
+  {{- $host := dict "host" .host "paths" $paths -}}
+  {{- $hosts = append $hosts $host -}}
+{{- end -}}
+
+{{- $_ := set $.Values.ingress.main "hosts" $hosts -}}
+
 {{/* Render the templates */}}
 {{ include "tc.v1.common.loader.apply" . }}