diff --git a/docs/documentation/upgrading/topics/changes/changes-26_6_0.adoc b/docs/documentation/upgrading/topics/changes/changes-26_6_0.adoc
new file mode 100644
index 00000000000..c952461f3a7
--- /dev/null
+++ b/docs/documentation/upgrading/topics/changes/changes-26_6_0.adoc
@@ -0,0 +1,35 @@
+// ------------------------ Breaking changes ------------------------  //
+== Breaking changes
+
+Breaking changes are identified as those that might require changes for existing users to their configurations or applications.
+In minor or patch releases, {project_name} will only introduce breaking changes to fix bugs.
+
+=== <TODO>
+
+// ------------------------ Notable changes ------------------------ //
+== Notable changes
+
+Notable changes may include internal behavior changes that prevent common misconfigurations, bugs that are fixed, or changes to simplify running {project_name}.
+It also lists significant changes to internal APIs.
+
+=== New database indexes on the `BROKER_LINK` table
+
+The `BROKER_LINK` table now contains two additional indexes `IDX_BROKER_LINK_USER_ID` and `IDX_BROKER_LINK_IDENTITY_PROVIDER` to improve performance.
+
+If the table contains more than 300000 entries, {project_name} will skip the index creation by default during the automatic schema migration and instead log the SQL statement on the console during migration to be applied manually after {project_name}'s startup.
+See the link:{upgradingguide_link}[{upgradingguide_name}] for details on how to configure a different limit.
+
+// ------------------------ Deprecated features ------------------------ //
+== Deprecated features
+
+The following sections provide details on deprecated features.
+
+=== <TODO>
+
+// ------------------------ Removed features ------------------------ //
+== Removed features
+
+The following features have been removed from this release.
+
+=== <TODO>
+
diff --git a/docs/documentation/upgrading/topics/changes/changes.adoc b/docs/documentation/upgrading/topics/changes/changes.adoc
index 6ce4e127381..8b52a89f507 100644
--- a/docs/documentation/upgrading/topics/changes/changes.adoc
+++ b/docs/documentation/upgrading/topics/changes/changes.adoc
@@ -1,6 +1,10 @@
 [[migration-changes]]
 == Migration Changes
 
+=== Migrating to 26.6.0
+
+include::changes-26_6_0.adoc[leveloffset=2]
+
 === Migrating to 26.5.0
 
 include::changes-26_5_0.adoc[leveloffset=2]
diff --git a/model/jpa/src/main/resources/META-INF/jpa-changelog-26.6.0.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-26.6.0.xml
new file mode 100644
index 00000000000..1ab0b80bf08
--- /dev/null
+++ b/model/jpa/src/main/resources/META-INF/jpa-changelog-26.6.0.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+  ~ * Copyright 2025 Red Hat, Inc. and/or its affiliates
+  ~ * and other contributors as indicated by the @author tags.
+  ~ *
+  ~ * Licensed under the Apache License, Version 2.0 (the "License");
+  ~ * you may not use this file except in compliance with the License.
+  ~ * You may obtain a copy of the License at
+  ~ *
+  ~ * http://www.apache.org/licenses/LICENSE-2.0
+  ~ *
+  ~ * Unless required by applicable law or agreed to in writing, software
+  ~ * distributed under the License is distributed on an "AS IS" BASIS,
+  ~ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ * See the License for the specific language governing permissions and
+  ~ * limitations under the License.
+  -->
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+    <changeSet author="keycloak" id="26.6.0-45009-broker-link-user-id">
+        <preConditions onSqlOutput="TEST" onFail="MARK_RAN">
+            <not>
+                <indexExists tableName="BROKER_LINK" indexName="IDX_BROKER_LINK_USER_ID" />
+            </not>
+        </preConditions>
+        <createIndex tableName="BROKER_LINK" indexName="IDX_BROKER_LINK_USER_ID">
+            <column name="USER_ID" type="VARCHAR(255)" />
+        </createIndex>
+    </changeSet>
+
+    <changeSet author="keycloak" id="26.6.0-45009-broker-link-identity-provider">
+        <preConditions onSqlOutput="TEST" onFail="MARK_RAN">
+            <not>
+                <indexExists tableName="BROKER_LINK" indexName="IDX_BROKER_LINK_IDENTITY_PROVIDER" />
+            </not>
+        </preConditions>
+        <createIndex tableName="BROKER_LINK" indexName="IDX_BROKER_LINK_IDENTITY_PROVIDER">
+            <column name="REALM_ID" type="VARCHAR(36)" />
+            <column name="IDENTITY_PROVIDER" type="VARCHAR(255)" />
+            <column name="BROKER_USER_ID" type="VARCHAR(255)" />
+        </createIndex>
+    </changeSet>
+
+</databaseChangeLog>
diff --git a/model/jpa/src/main/resources/META-INF/jpa-changelog-master.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-master.xml
index a645be77349..95c784e495d 100755
--- a/model/jpa/src/main/resources/META-INF/jpa-changelog-master.xml
+++ b/model/jpa/src/main/resources/META-INF/jpa-changelog-master.xml
@@ -90,5 +90,6 @@
     <include file="META-INF/jpa-changelog-26.3.0.xml"/>
     <include file="META-INF/jpa-changelog-26.4.0.xml"/>
     <include file="META-INF/jpa-changelog-26.5.0.xml"/>
+    <include file="META-INF/jpa-changelog-26.6.0.xml"/>
 
 </databaseChangeLog>