diff --git a/model/jpa/src/main/resources/META-INF/jpa-changelog-3.4.0.xml b/model/jpa/src/main/resources/META-INF/jpa-changelog-3.4.0.xml
index 5cdc0c5b55..b220cb2e58 100644
--- a/model/jpa/src/main/resources/META-INF/jpa-changelog-3.4.0.xml
+++ b/model/jpa/src/main/resources/META-INF/jpa-changelog-3.4.0.xml
@@ -47,4 +47,63 @@
         <addPrimaryKey columnNames="CLIENT_ID,VALUE" constraintName="CONSTRAINT_WEB_ORIGINS" tableName="WEB_ORIGINS"/>
     </changeSet>
 
+    <changeSet author="hmlnarik@redhat.com" id="3.4.0-KEYCLOAK-5230">
+
+        <createIndex tableName="FED_USER_ATTRIBUTE" indexName="IDX_FU_ATTRIBUTE">
+            <column name="USER_ID" type="VARCHAR(255)" />
+            <column name="REALM_ID" type="VARCHAR(36)" />
+            <column name="NAME" type="VARCHAR(255)" />
+        </createIndex>
+
+        <createIndex tableName="FED_USER_CONSENT" indexName="IDX_FU_CONSENT">
+            <column name="USER_ID" type="VARCHAR(255)" />
+            <column name="CLIENT_ID" type="VARCHAR(36)" />
+        </createIndex>
+
+        <createIndex tableName="FED_USER_CONSENT" indexName="IDX_FU_CONSENT_RU">
+            <column name="REALM_ID" type="VARCHAR(36)" />
+            <column name="USER_ID" type="VARCHAR(255)" />
+        </createIndex>
+
+        <createIndex tableName="FED_USER_CREDENTIAL" indexName="IDX_FU_CREDENTIAL">
+            <column name="USER_ID" type="VARCHAR(255)" />
+            <column name="TYPE" type="VARCHAR(255)" />
+        </createIndex>
+
+        <createIndex tableName="FED_USER_CREDENTIAL" indexName="IDX_FU_CREDENTIAL_RU">
+            <column name="REALM_ID" type="VARCHAR(36)" />
+            <column name="USER_ID" type="VARCHAR(255)" />
+        </createIndex>
+
+        <createIndex tableName="FED_USER_GROUP_MEMBERSHIP" indexName="IDX_FU_GROUP_MEMBERSHIP">
+            <column name="USER_ID" type="VARCHAR(255)" />
+            <column name="GROUP_ID" type="VARCHAR(36)" />
+        </createIndex>
+
+        <createIndex tableName="FED_USER_GROUP_MEMBERSHIP" indexName="IDX_FU_GROUP_MEMBERSHIP_RU">
+            <column name="REALM_ID" type="VARCHAR(36)" />
+            <column name="USER_ID" type="VARCHAR(255)" />
+        </createIndex>
+
+        <createIndex tableName="FED_USER_REQUIRED_ACTION" indexName="IDX_FU_REQUIRED_ACTION">
+            <column name="USER_ID" type="VARCHAR(255)" />
+            <column name="REQUIRED_ACTION" type="VARCHAR(255)" />
+        </createIndex>
+
+        <createIndex tableName="FED_USER_REQUIRED_ACTION" indexName="IDX_FU_REQUIRED_ACTION_RU">
+            <column name="REALM_ID" type="VARCHAR(36)" />
+            <column name="USER_ID" type="VARCHAR(255)" />
+        </createIndex>
+
+        <createIndex tableName="FED_USER_ROLE_MAPPING" indexName="IDX_FU_ROLE_MAPPING">
+            <column name="USER_ID" type="VARCHAR(255)" />
+            <column name="ROLE_ID" type="VARCHAR(36)" />
+        </createIndex>
+
+        <createIndex tableName="FED_USER_ROLE_MAPPING" indexName="IDX_FU_ROLE_MAPPING_RU">
+            <column name="REALM_ID" type="VARCHAR(36)" />
+            <column name="USER_ID" type="VARCHAR(255)" />
+        </createIndex>
+    </changeSet>
+
 </databaseChangeLog>