diff --git a/enterprise/kubeapps/2.1.4/templates/common.yaml b/enterprise/kubeapps/2.1.4/templates/common.yaml
deleted file mode 100644
index 995efb03eb0..00000000000
--- a/enterprise/kubeapps/2.1.4/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.4/.helmignore b/enterprise/kubeapps/2.1.8/.helmignore
similarity index 100%
rename from enterprise/kubeapps/2.1.4/.helmignore
rename to enterprise/kubeapps/2.1.8/.helmignore
diff --git a/enterprise/kubeapps/2.1.4/CHANGELOG.md b/enterprise/kubeapps/2.1.8/CHANGELOG.md
similarity index 92%
rename from enterprise/kubeapps/2.1.4/CHANGELOG.md
rename to enterprise/kubeapps/2.1.8/CHANGELOG.md
index c5fda1d8a1d..65e0a206ac9 100644
--- a/enterprise/kubeapps/2.1.4/CHANGELOG.md
+++ b/enterprise/kubeapps/2.1.8/CHANGELOG.md
@@ -41,6 +41,10 @@ title: Changelog
 
 
 
+
+
+
+
 
 
 
diff --git a/enterprise/kubeapps/2.1.4/Chart.yaml b/enterprise/kubeapps/2.1.8/Chart.yaml
similarity index 98%
rename from enterprise/kubeapps/2.1.4/Chart.yaml
rename to enterprise/kubeapps/2.1.8/Chart.yaml
index 99bb59108cc..ead6115e433 100644
--- a/enterprise/kubeapps/2.1.4/Chart.yaml
+++ b/enterprise/kubeapps/2.1.8/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.4
+version: 2.1.8
diff --git a/enterprise/kubeapps/2.1.4/README.md b/enterprise/kubeapps/2.1.8/README.md
similarity index 100%
rename from enterprise/kubeapps/2.1.4/README.md
rename to enterprise/kubeapps/2.1.8/README.md
diff --git a/enterprise/kubeapps/2.1.4/app-readme.md b/enterprise/kubeapps/2.1.8/app-readme.md
similarity index 100%
rename from enterprise/kubeapps/2.1.4/app-readme.md
rename to enterprise/kubeapps/2.1.8/app-readme.md
diff --git a/enterprise/kubeapps/2.1.4/charts/common-18.0.3.tgz b/enterprise/kubeapps/2.1.8/charts/common-18.0.3.tgz
similarity index 100%
rename from enterprise/kubeapps/2.1.4/charts/common-18.0.3.tgz
rename to enterprise/kubeapps/2.1.8/charts/common-18.0.3.tgz
diff --git a/enterprise/kubeapps/2.1.4/charts/kubeapps-14.5.2.tgz b/enterprise/kubeapps/2.1.8/charts/kubeapps-14.5.2.tgz
similarity index 100%
rename from enterprise/kubeapps/2.1.4/charts/kubeapps-14.5.2.tgz
rename to enterprise/kubeapps/2.1.8/charts/kubeapps-14.5.2.tgz
diff --git a/enterprise/kubeapps/2.1.4/ix_values.yaml b/enterprise/kubeapps/2.1.8/ix_values.yaml
similarity index 95%
rename from enterprise/kubeapps/2.1.4/ix_values.yaml
rename to enterprise/kubeapps/2.1.8/ix_values.yaml
index 516685edb41..4e9d710bb90 100644
--- a/enterprise/kubeapps/2.1.4/ix_values.yaml
+++ b/enterprise/kubeapps/2.1.8/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.4/questions.yaml b/enterprise/kubeapps/2.1.8/questions.yaml
similarity index 95%
rename from enterprise/kubeapps/2.1.4/questions.yaml
rename to enterprise/kubeapps/2.1.8/questions.yaml
index 8c3c07c4287..0d9ab7de65a 100755
--- a/enterprise/kubeapps/2.1.4/questions.yaml
+++ b/enterprise/kubeapps/2.1.8/questions.yaml
@@ -64,58 +64,6 @@ questions:
       type: dict
       attrs:
 
-        - variable: main
-          label: "token-bypass Service"
-          description: "The token-bypass service"
-          schema:
-            additional_attrs: true
-            type: dict
-            attrs:
-              - variable: enabled
-                label: Enable the Service
-                schema:
-                  type: boolean
-                  default: true
-                  hidden: true
-              - variable: type
-                label: Service Type
-                description: "ClusterIP's are only internally available and Loadbalancer exposes the service using the system loadbalancer"
-                schema:
-                  type: string
-                  default: LoadBalancer
-                  enum:
-                    - value: LoadBalancer
-                      description: LoadBalancer (Expose Ports)
-                    - value: ClusterIP
-                      description: ClusterIP (Do Not Expose Ports)
-
-              - variable: loadBalancerIP
-                label: LoadBalancer IP
-                description: "MetalLB Only: Selects the Loadbalancer IP to expose on. Required when using PortalButton with MetalLB"
-                schema:
-                  show_if: [["type", "=", "LoadBalancer"]]
-                  type: string
-                  default: ""
-              - variable: ports
-                label: "Service's Port(s) Configuration"
-                schema:
-                  additional_attrs: true
-                  type: dict
-                  attrs:
-
-                    - variable: main
-                      label: "token-bypass Service Port Configuration"
-                      schema:
-                        additional_attrs: true
-                        type: dict
-                        attrs:
-                          - variable: port
-                            label: "Port"
-                            description: "This port exposes the container port on the service"
-                            schema:
-                              type: int
-                              default: 8080
-                              required: true
         - variable: tckubeapps
           label: "KubeApps Service"
           description: "The Primary service on which the healthcheck runs, often the webUI"
diff --git a/enterprise/kubeapps/2.1.4/templates/NOTES.txt b/enterprise/kubeapps/2.1.8/templates/NOTES.txt
similarity index 100%
rename from enterprise/kubeapps/2.1.4/templates/NOTES.txt
rename to enterprise/kubeapps/2.1.8/templates/NOTES.txt
diff --git a/enterprise/kubeapps/2.1.8/templates/common.yaml b/enterprise/kubeapps/2.1.8/templates/common.yaml
new file mode 100644
index 00000000000..4b5e888100c
--- /dev/null
+++ b/enterprise/kubeapps/2.1.8/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.4/values.yaml b/enterprise/kubeapps/2.1.8/values.yaml
similarity index 100%
rename from enterprise/kubeapps/2.1.4/values.yaml
rename to enterprise/kubeapps/2.1.8/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 99ca1777683..c8e87f531e2 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