diff --git a/charts/centralidp/README.md.gotmpl b/charts/centralidp/README.md.gotmpl
index 69905b9b..8b6e0f6c 100644
--- a/charts/centralidp/README.md.gotmpl
+++ b/charts/centralidp/README.md.gotmpl
@@ -57,7 +57,7 @@ Please see notes at [Values.seeding](values.yaml#L146) for upgrading the configu
 
 ### To 3.0.0
 
-This major changes from the Keycloak version from  22.0.3 to 23.0.7 and bumps the PostgresSQL version of the subchart from 15.4.0 to 15.6.0.
+This major changes from the Keycloak version from  22.0.3 to 23.0.7 and bumps the PostgresSQL version of the subchart from 15.4.0 to the latest available version of 15.
 
 No major issues are expected during the upgrade.
 
diff --git a/charts/centralidp/values.yaml b/charts/centralidp/values.yaml
index 8c0e81a9..1167de00 100644
--- a/charts/centralidp/values.yaml
+++ b/charts/centralidp/values.yaml
@@ -106,7 +106,9 @@ keycloak:
     # https://eclipse-tractusx.github.io/docs/release/trg-5/trg-5-07/#aligning-dependency-versions).
     # Keycloak helm-chart from Bitnami has moved on to version 16.
     image:
-      tag: "15.6.0"
+      tag: "15-debian-11"
+    commonLabels:
+      app.kubernetes.io/version: "15"
     auth:
       # -- Non-root username.
       username: kccentral
diff --git a/charts/sharedidp/README.md.gotmpl b/charts/sharedidp/README.md.gotmpl
index 3bc255b4..bb64f9e9 100644
--- a/charts/sharedidp/README.md.gotmpl
+++ b/charts/sharedidp/README.md.gotmpl
@@ -63,7 +63,7 @@ Generate client-secrets for the service account with access type 'confidential'.
 
 ### To 3.0.0
 
-This major changes from the Keycloak version from  22.0.3 to 23.0.7 and bumps the PostgresSQL version of the subchart from 15.4.0 to 15.6.0.
+This major changes from the Keycloak version from  22.0.3 to 23.0.7 and bumps the PostgresSQL version of the subchart from 15.4.0 to the latest available version of 15.
 
 No major issues are expected during the upgrade.
 
diff --git a/charts/sharedidp/values.yaml b/charts/sharedidp/values.yaml
index 9ac4db06..506ed3f2 100644
--- a/charts/sharedidp/values.yaml
+++ b/charts/sharedidp/values.yaml
@@ -114,7 +114,9 @@ keycloak:
     # https://eclipse-tractusx.github.io/docs/release/trg-5/trg-5-07/#aligning-dependency-versions).
     # Keycloak helm-chart from Bitnami has moved on to version 16.
     image:
-      tag: "15.6.0"
+      tag: "15-debian-11"
+    commonLabels:
+      app.kubernetes.io/version: "15"
     auth:
       # -- Non-root username.
       username: kcshared