diff --git a/.github/release-please/manifest.json b/.github/release-please/manifest.json
index 05735199f1..b2847d74e0 100644
--- a/.github/release-please/manifest.json
+++ b/.github/release-please/manifest.json
@@ -1 +1 @@
-{"charts/base-cluster":"8.2.0","charts/teuto-portal-k8s-worker":"3.3.0","charts/t8s-cluster":"9.3.1","charts/stellio-context-broker":"0.1.0","charts/chirpstack":"0.1.0","charts/common":"1.5.0","charts/ckan":"1.3.3","charts/teuto-cnpg":"2.0.0"}
+{"charts/base-cluster":"8.2.1","charts/teuto-portal-k8s-worker":"3.3.0","charts/t8s-cluster":"9.3.1","charts/stellio-context-broker":"0.1.0","charts/chirpstack":"0.1.0","charts/common":"1.5.0","charts/ckan":"1.3.3","charts/teuto-cnpg":"2.0.0"}
diff --git a/charts/base-cluster/CHANGELOG.md b/charts/base-cluster/CHANGELOG.md
index 4564475936..3dca985d00 100644
--- a/charts/base-cluster/CHANGELOG.md
+++ b/charts/base-cluster/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [8.2.1](https://github.com/teutonet/teutonet-helm-charts/compare/base-cluster-v8.2.0...base-cluster-v8.2.1) (2025-07-24)
+
+
+### Bug Fixes
+
+* **base-cluster/rbac:** whitespace trimming ([#1608](https://github.com/teutonet/teutonet-helm-charts/issues/1608)) ([4b028b4](https://github.com/teutonet/teutonet-helm-charts/commit/4b028b4ad0c04eadba520452292a15748e8b3d95))
+
 ## [8.2.0](https://github.com/teutonet/teutonet-helm-charts/compare/base-cluster-v8.1.0...base-cluster-v8.2.0) (2025-07-21)
 
 
diff --git a/charts/base-cluster/Chart.yaml b/charts/base-cluster/Chart.yaml
index 7cbcefd808..146a3ae125 100644
--- a/charts/base-cluster/Chart.yaml
+++ b/charts/base-cluster/Chart.yaml
@@ -16,10 +16,10 @@ maintainers:
     name: tasches
 name: base-cluster
 sources:
-  - https://github.com/teutonet/teutonet-helm-charts/tree/base-cluster-v8.2.0/charts/base-cluster
+  - https://github.com/teutonet/teutonet-helm-charts/tree/base-cluster-v8.2.1/charts/base-cluster
   - https://github.com/teutonet/teutonet-helm-charts/tree/main/charts/base-cluster
 type: application
-version: 8.2.0
+version: 8.2.1
 annotations:
   artifacthub.io/images: |-
     - image: docker.io/aelbakry/kdave-server:1.0.4                                                                                     #  monitoring/HelmRelease/kdave/null/Deployment/kdave.yaml
diff --git a/charts/base-cluster/README.md b/charts/base-cluster/README.md
index 3321ad49ea..79e521f27b 100644
--- a/charts/base-cluster/README.md
+++ b/charts/base-cluster/README.md
@@ -1,6 +1,6 @@
 <!-- vim: set ft=markdown: --># base-cluster
 
-![Version: 8.2.0](https://img.shields.io/badge/Version-8.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 8.2.1](https://img.shields.io/badge/Version-8.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 A common base for every kubernetes cluster
 
@@ -246,7 +246,7 @@ output of `helm -n flux-system get notes base-cluster`
 
 ## Source Code
 
-* <https://github.com/teutonet/teutonet-helm-charts/tree/base-cluster-v8.2.0/charts/base-cluster>
+* <https://github.com/teutonet/teutonet-helm-charts/tree/base-cluster-v8.2.1/charts/base-cluster>
 * <https://github.com/teutonet/teutonet-helm-charts/tree/main/charts/base-cluster>
 
 ## Requirements