diff --git a/enterprise/blocky/13.5.4/.helmignore b/enterprise/blocky/13.5.8/.helmignore
similarity index 100%
rename from enterprise/blocky/13.5.4/.helmignore
rename to enterprise/blocky/13.5.8/.helmignore
diff --git a/enterprise/blocky/13.5.4/CHANGELOG.md b/enterprise/blocky/13.5.8/CHANGELOG.md
similarity index 94%
rename from enterprise/blocky/13.5.4/CHANGELOG.md
rename to enterprise/blocky/13.5.8/CHANGELOG.md
index d475a9e616e..52e825490bb 100644
--- a/enterprise/blocky/13.5.4/CHANGELOG.md
+++ b/enterprise/blocky/13.5.8/CHANGELOG.md
@@ -24,6 +24,10 @@ title: Changelog
 
 
 
+
+
+
+
 
 
 
@@ -93,7 +97,3 @@ title: Changelog
 
 - update container image common to v17.2.22[@e7c9056](https://github.com/e7c9056) by renovate ([#16986](https://github.com/truecharts/charts/issues/16986))
 
-
-## [blocky-12.2.0](https://github.com/truecharts/charts/compare/blocky-12.1.8...blocky-12.2.0) (2024-01-08)
-
-### Chore
diff --git a/enterprise/blocky/13.5.4/Chart.yaml b/enterprise/blocky/13.5.8/Chart.yaml
similarity index 98%
rename from enterprise/blocky/13.5.4/Chart.yaml
rename to enterprise/blocky/13.5.8/Chart.yaml
index 4a151639470..f08bd977758 100644
--- a/enterprise/blocky/13.5.4/Chart.yaml
+++ b/enterprise/blocky/13.5.8/Chart.yaml
@@ -44,4 +44,4 @@ sources:
   - https://hub.docker.com/r/spx01/blocky
   - https://quay.io/oriedge/k8s_gateway
 type: application
-version: 13.5.4
+version: 13.5.8
diff --git a/enterprise/blocky/13.5.4/LICENSE b/enterprise/blocky/13.5.8/LICENSE
similarity index 100%
rename from enterprise/blocky/13.5.4/LICENSE
rename to enterprise/blocky/13.5.8/LICENSE
diff --git a/enterprise/blocky/13.5.4/README.md b/enterprise/blocky/13.5.8/README.md
similarity index 100%
rename from enterprise/blocky/13.5.4/README.md
rename to enterprise/blocky/13.5.8/README.md
diff --git a/enterprise/blocky/13.5.4/app-readme.md b/enterprise/blocky/13.5.8/app-readme.md
similarity index 100%
rename from enterprise/blocky/13.5.4/app-readme.md
rename to enterprise/blocky/13.5.8/app-readme.md
diff --git a/enterprise/blocky/13.5.4/charts/common-18.1.2.tgz b/enterprise/blocky/13.5.8/charts/common-18.1.2.tgz
similarity index 100%
rename from enterprise/blocky/13.5.4/charts/common-18.1.2.tgz
rename to enterprise/blocky/13.5.8/charts/common-18.1.2.tgz
diff --git a/enterprise/blocky/13.5.4/charts/redis-11.2.1.tgz b/enterprise/blocky/13.5.8/charts/redis-11.2.1.tgz
similarity index 100%
rename from enterprise/blocky/13.5.4/charts/redis-11.2.1.tgz
rename to enterprise/blocky/13.5.8/charts/redis-11.2.1.tgz
diff --git a/enterprise/blocky/13.5.4/dashboard.json b/enterprise/blocky/13.5.8/dashboard.json
similarity index 100%
rename from enterprise/blocky/13.5.4/dashboard.json
rename to enterprise/blocky/13.5.8/dashboard.json
diff --git a/enterprise/blocky/13.5.4/dashboardpsql.json b/enterprise/blocky/13.5.8/dashboardpsql.json
similarity index 98%
rename from enterprise/blocky/13.5.4/dashboardpsql.json
rename to enterprise/blocky/13.5.8/dashboardpsql.json
index 26fa993276a..f3b6dd88fc7 100644
--- a/enterprise/blocky/13.5.4/dashboardpsql.json
+++ b/enterprise/blocky/13.5.8/dashboardpsql.json
@@ -801,22 +801,22 @@
   "templating": {
     "list": [
       {
-          "current": {
-              "selected": false,
-              "text": "Postgresql",
-              "value": "Postgresql"
-          },
-          "hide": 0,
-          "includeAll": false,
-          "multi": false,
-          "name": "DS_POSTGRES",
-          "label": "datasource",
-          "options": [],
-          "query": "postgresql",
-          "refresh": 1,
-          "regex": "",
-          "skipUrlSync": false,
-          "type": "datasource"
+        "current": {
+          "selected": false,
+          "text": "BlockyPostgres",
+          "value": "blockypostgres"
+        },
+        "hide": 0,
+        "includeAll": false,
+        "label": "datasource",
+        "multi": false,
+        "name": "DS_POSTGRES",
+        "options": [],
+        "query": "grafana-postgresql-datasource",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "type": "datasource"
       },
       {
         "allValue": "",
diff --git a/enterprise/blocky/13.5.4/ix_values.yaml b/enterprise/blocky/13.5.8/ix_values.yaml
similarity index 98%
rename from enterprise/blocky/13.5.4/ix_values.yaml
rename to enterprise/blocky/13.5.8/ix_values.yaml
index a328d979715..81db7d553c7 100644
--- a/enterprise/blocky/13.5.4/ix_values.yaml
+++ b/enterprise/blocky/13.5.8/ix_values.yaml
@@ -318,7 +318,7 @@ configmap:
         - name: BlockyPostgres
           type: postgres
           uid: blockypostgres
-          url: {{ printf "%s:5432" (.Values.cnpg.main.creds.host | trimAll "\"") }}
+          url: {{ printf "%s.%s:5432" (.Values.cnpg.main.creds.host | trimAll "\"") .Release.Namespace }}
           access: proxy
           user: {{ .Values.cnpg.main.user }}
           secureJsonData:
diff --git a/enterprise/blocky/13.5.4/questions.yaml b/enterprise/blocky/13.5.8/questions.yaml
similarity index 100%
rename from enterprise/blocky/13.5.4/questions.yaml
rename to enterprise/blocky/13.5.8/questions.yaml
diff --git a/enterprise/blocky/13.5.4/templates/NOTES.txt b/enterprise/blocky/13.5.8/templates/NOTES.txt
similarity index 100%
rename from enterprise/blocky/13.5.4/templates/NOTES.txt
rename to enterprise/blocky/13.5.8/templates/NOTES.txt
diff --git a/enterprise/blocky/13.5.4/templates/_blockyConfig.tpl b/enterprise/blocky/13.5.8/templates/_blockyConfig.tpl
similarity index 100%
rename from enterprise/blocky/13.5.4/templates/_blockyConfig.tpl
rename to enterprise/blocky/13.5.8/templates/_blockyConfig.tpl
diff --git a/enterprise/blocky/13.5.4/templates/_k8sgateway.tpl b/enterprise/blocky/13.5.8/templates/_k8sgateway.tpl
similarity index 100%
rename from enterprise/blocky/13.5.4/templates/_k8sgateway.tpl
rename to enterprise/blocky/13.5.8/templates/_k8sgateway.tpl
diff --git a/enterprise/blocky/13.5.4/templates/common.yaml b/enterprise/blocky/13.5.8/templates/common.yaml
similarity index 100%
rename from enterprise/blocky/13.5.4/templates/common.yaml
rename to enterprise/blocky/13.5.8/templates/common.yaml
diff --git a/enterprise/blocky/13.5.4/values.yaml b/enterprise/blocky/13.5.8/values.yaml
similarity index 100%
rename from enterprise/blocky/13.5.4/values.yaml
rename to enterprise/blocky/13.5.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 4f49d70274d..d6dbb4db04a 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