diff --git a/enterprise/kubeapps/2.1.3/charts/common-18.0.2.tgz b/enterprise/kubeapps/2.1.3/charts/common-18.0.2.tgz
deleted file mode 100644
index 1588b1d05a1..00000000000
Binary files a/enterprise/kubeapps/2.1.3/charts/common-18.0.2.tgz and /dev/null differ
diff --git a/enterprise/kubeapps/2.1.3/templates/common.yaml b/enterprise/kubeapps/2.1.3/templates/common.yaml
deleted file mode 100644
index 995efb03eb0..00000000000
--- a/enterprise/kubeapps/2.1.3/templates/common.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-{{/* Make sure all variables are set properly */}}
-{{- include "tc.v1.common.loader.init" . }}
-
-{{/* Render the templates */}}
-{{ include "tc.v1.common.loader.apply" . }}
diff --git a/enterprise/kubeapps/2.1.3/.helmignore b/enterprise/kubeapps/2.1.7/.helmignore
similarity index 100%
rename from enterprise/kubeapps/2.1.3/.helmignore
rename to enterprise/kubeapps/2.1.7/.helmignore
diff --git a/enterprise/kubeapps/2.1.3/CHANGELOG.md b/enterprise/kubeapps/2.1.7/CHANGELOG.md
similarity index 92%
rename from enterprise/kubeapps/2.1.3/CHANGELOG.md
rename to enterprise/kubeapps/2.1.7/CHANGELOG.md
index 626c5850bac..781ad05a929 100644
--- a/enterprise/kubeapps/2.1.3/CHANGELOG.md
+++ b/enterprise/kubeapps/2.1.7/CHANGELOG.md
@@ -40,6 +40,10 @@ title: Changelog
 
 
 
+
+
+
+
 
 
 
diff --git a/enterprise/kubeapps/2.1.3/Chart.yaml b/enterprise/kubeapps/2.1.7/Chart.yaml
similarity index 93%
rename from enterprise/kubeapps/2.1.3/Chart.yaml
rename to enterprise/kubeapps/2.1.7/Chart.yaml
index 003409b9e91..1ca8a26afa5 100644
--- a/enterprise/kubeapps/2.1.3/Chart.yaml
+++ b/enterprise/kubeapps/2.1.7/Chart.yaml
@@ -4,13 +4,13 @@ annotations:
   truecharts.org/SCALE-support: "true"
   truecharts.org/category: operators
   truecharts.org/max_helm_version: "3.14"
-  truecharts.org/min_helm_version: "3.12"
+  truecharts.org/min_helm_version: "3.11"
   truecharts.org/train: enterprise
 apiVersion: v2
 appVersion: 0.0.3
 dependencies:
   - name: common
-    version: 18.0.2
+    version: 18.0.3
     repository: oci://tccr.io/truecharts
     condition: ""
     alias: ""
@@ -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.3
+version: 2.1.7
diff --git a/enterprise/kubeapps/2.1.3/README.md b/enterprise/kubeapps/2.1.7/README.md
similarity index 100%
rename from enterprise/kubeapps/2.1.3/README.md
rename to enterprise/kubeapps/2.1.7/README.md
diff --git a/enterprise/kubeapps/2.1.3/app-readme.md b/enterprise/kubeapps/2.1.7/app-readme.md
similarity index 100%
rename from enterprise/kubeapps/2.1.3/app-readme.md
rename to enterprise/kubeapps/2.1.7/app-readme.md
diff --git a/enterprise/kubeapps/2.1.7/charts/common-18.0.3.tgz b/enterprise/kubeapps/2.1.7/charts/common-18.0.3.tgz
new file mode 100644
index 00000000000..94e930e88c1
Binary files /dev/null and b/enterprise/kubeapps/2.1.7/charts/common-18.0.3.tgz differ
diff --git a/enterprise/kubeapps/2.1.3/charts/kubeapps-14.5.2.tgz b/enterprise/kubeapps/2.1.7/charts/kubeapps-14.5.2.tgz
similarity index 100%
rename from enterprise/kubeapps/2.1.3/charts/kubeapps-14.5.2.tgz
rename to enterprise/kubeapps/2.1.7/charts/kubeapps-14.5.2.tgz
diff --git a/enterprise/kubeapps/2.1.3/ix_values.yaml b/enterprise/kubeapps/2.1.7/ix_values.yaml
similarity index 95%
rename from enterprise/kubeapps/2.1.3/ix_values.yaml
rename to enterprise/kubeapps/2.1.7/ix_values.yaml
index 516685edb41..4e9d710bb90 100644
--- a/enterprise/kubeapps/2.1.3/ix_values.yaml
+++ b/enterprise/kubeapps/2.1.7/ix_values.yaml
@@ -47,19 +47,17 @@ service:
   ## TODO: Enable
   main:
     enabled: false
-    primary: true
+    primary: false
     expandObjectName: false
     ports:
       main:
         ## TODO: Enable
         enabled: false
-        primary: true
+        primary: false
         port: 3000
         targetPort: 3000
   tckubeapps:
     enabled: true
-    expandObjectName: false
-    ## TODO: Move to main service
     primary: true
     labels:
       truecharts.org/flagged: "true"
diff --git a/enterprise/kubeapps/2.1.3/questions.yaml b/enterprise/kubeapps/2.1.7/questions.yaml
similarity index 100%
rename from enterprise/kubeapps/2.1.3/questions.yaml
rename to enterprise/kubeapps/2.1.7/questions.yaml
diff --git a/enterprise/kubeapps/2.1.3/templates/NOTES.txt b/enterprise/kubeapps/2.1.7/templates/NOTES.txt
similarity index 100%
rename from enterprise/kubeapps/2.1.3/templates/NOTES.txt
rename to enterprise/kubeapps/2.1.7/templates/NOTES.txt
diff --git a/enterprise/kubeapps/2.1.7/templates/common.yaml b/enterprise/kubeapps/2.1.7/templates/common.yaml
new file mode 100644
index 00000000000..4b5e888100c
--- /dev/null
+++ b/enterprise/kubeapps/2.1.7/templates/common.yaml
@@ -0,0 +1,19 @@
+{{/* Make sure all variables are set properly */}}
+{{- include "tc.v1.common.loader.init" . }}
+
+{{- $overrideService := dict "name" "tckubeapps" "port" 8080 -}}
+{{- $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" . }}
diff --git a/enterprise/kubeapps/2.1.3/values.yaml b/enterprise/kubeapps/2.1.7/values.yaml
similarity index 100%
rename from enterprise/kubeapps/2.1.3/values.yaml
rename to enterprise/kubeapps/2.1.7/values.yaml
diff --git a/stable/plausible/10.2.5/charts/clickhouse-12.1.3.tgz b/stable/plausible/10.2.5/charts/clickhouse-12.1.3.tgz
index 4bea48a9036..6ec0df629ed 100644
Binary files a/stable/plausible/10.2.5/charts/clickhouse-12.1.3.tgz and b/stable/plausible/10.2.5/charts/clickhouse-12.1.3.tgz differ