diff --git a/docs/documentation/release_notes/topics/24_0_0.adoc b/docs/documentation/release_notes/topics/24_0_0.adoc
index 7138f91013e..f9fba887160 100644
--- a/docs/documentation/release_notes/topics/24_0_0.adoc
+++ b/docs/documentation/release_notes/topics/24_0_0.adoc
@@ -116,4 +116,11 @@ In this release, if a user tries to follow the link to verify the email and the
 will be shown.
 
 In addition to that, a new error (`EMAIL_ALREADY_VERIFIED`) event will be fired to indicate an attempt to verify an already verified email. You can
-use this event to track possible attempts to hijack user accounts in case the link has leaked or to alert users if they do not recognize the action.
\ No newline at end of file
+use this event to track possible attempts to hijack user accounts in case the link has leaked or to alert users if they do not recognize the action.
+
+= Infinispan metrics use labels for cache manager and cache names
+
+When enabling metrics for {project_name}'s embedded caches, the metrics now use labels for the cache manager and the cache names.
+
+For more details, check the
+link:{upgradingguide_link}[{upgradingguide_name}].
diff --git a/docs/documentation/upgrading/topics/keycloak/changes-24_0_0.adoc b/docs/documentation/upgrading/topics/keycloak/changes-24_0_0.adoc
index 33b47c77272..2aa18f73497 100644
--- a/docs/documentation/upgrading/topics/keycloak/changes-24_0_0.adoc
+++ b/docs/documentation/upgrading/topics/keycloak/changes-24_0_0.adoc
@@ -142,4 +142,24 @@ By using separate templates for each flow, a more clear distinction exist as to
 and potentially introduce unexpected changes and behavior that should only affect pages for a specific flow.
 
 If you have customizations to the `login-update-profile.ftl` template to customize how users update their profiles when authenticating through a broker, make sure to move your changes
-to the new template.
\ No newline at end of file
+to the new template.
+
+= Infinispan metrics use labels for cache manager and cache names
+
+When enabling metrics for {project_name}'s embedded caches, the metrics now use labels for the cache manager and the cache names.
+
+.Old metric example without labels
+----
+vendor_cache_manager_keycloak_cache_sessions_statistics_approximate_entries_in_memory{cache="sessions",node="..."}
+----
+
+.New metric example with labels
+----
+vendor_statistics_approximate_entries_in_memory{cache="sessions",cache_manager="keycloak",node="..."}
+----
+
+To revert the change for an installation, use a custom Infinispan XML configuration and change the configuration as follows:
+
+----
+<metrics names-as-tags="false" />
+----
diff --git a/quarkus/runtime/src/main/resources/cache-ispn.xml b/quarkus/runtime/src/main/resources/cache-ispn.xml
index b50cb347620..72cf71785ea 100644
--- a/quarkus/runtime/src/main/resources/cache-ispn.xml
+++ b/quarkus/runtime/src/main/resources/cache-ispn.xml
@@ -23,6 +23,7 @@
 
     <cache-container name="keycloak">
         <transport lock-timeout="60000"/>
+        <metrics names-as-tags="true" />
         <local-cache name="realms" simple-cache="true">
             <encoding>
                 <key media-type="application/x-java-object"/>
diff --git a/quarkus/runtime/src/main/resources/cache-local.xml b/quarkus/runtime/src/main/resources/cache-local.xml
index b44185402a9..09791b33e0e 100644
--- a/quarkus/runtime/src/main/resources/cache-local.xml
+++ b/quarkus/runtime/src/main/resources/cache-local.xml
@@ -22,6 +22,7 @@
         xmlns="urn:infinispan:config:14.0">
 
     <cache-container name="keycloak">
+        <metrics names-as-tags="true" />
         <local-cache name="default">
             <transaction transaction-manager-lookup="org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup"/>
         </local-cache>