diff --git a/src/main/java/org/gridsuite/modification/server/entities/ModificationApplicationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/ModificationApplicationEntity.java
index 30bec2237..e963aae9c 100644
--- a/src/main/java/org/gridsuite/modification/server/entities/ModificationApplicationEntity.java
+++ b/src/main/java/org/gridsuite/modification/server/entities/ModificationApplicationEntity.java
@@ -26,7 +26,8 @@
 @Table(
     name = "modification_application",
     indexes = {
-        @Index(name = "idx_modification_application_networkUuid", columnList = "networkUuid")
+        @Index(name = "idx_modification_application_networkUuid", columnList = "networkUuid"),
+        @Index(name = "modification_application_modification_uuid_idx", columnList = "modification_uuid")
     }
 )
 public class ModificationApplicationEntity {
diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LimitsPropertyModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LimitsPropertyModificationEntity.java
index 0783d83d9..4b7da0376 100644
--- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LimitsPropertyModificationEntity.java
+++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LimitsPropertyModificationEntity.java
@@ -7,12 +7,7 @@
 
 package org.gridsuite.modification.server.entities.equipment.modification;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -30,7 +25,8 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Entity
-@Table(name = "limits_property_modification")
+@Table(name = "limits_property_modification",
+        indexes = @Index(name = "limits_property_modification_operational_limit_group_id_idx", columnList = "operational_limit_group_id"))
 public class LimitsPropertyModificationEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/attribute/BooleanEquipmentAttributeModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/attribute/BooleanEquipmentAttributeModificationEntity.java
index 9db5517d0..2f762d3a0 100644
--- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/attribute/BooleanEquipmentAttributeModificationEntity.java
+++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/attribute/BooleanEquipmentAttributeModificationEntity.java
@@ -6,22 +6,19 @@
  */
 package org.gridsuite.modification.server.entities.equipment.modification.attribute;
 
+import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.gridsuite.modification.dto.EquipmentAttributeModificationInfos;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.ForeignKey;
-import jakarta.persistence.PrimaryKeyJoinColumn;
-import jakarta.persistence.Table;
-
 /**
  * @author Slimane Amar <slimane.amar at rte-france.com>
  */
 @NoArgsConstructor
 @Getter
 @Entity
-@Table(name = "booleanEquipmentAttributeModification")
+@Table(name = "booleanEquipmentAttributeModification",
+        indexes = @Index(name = "boolean_equipment_attribute_modif_vl_topology_modif_id_idx", columnList = "voltage_level_topology_modification_id"))
 @PrimaryKeyJoinColumn(foreignKey = @ForeignKey(name = "boolean_equipment_attribute_modification_id_fk_constraint"))
 public class BooleanEquipmentAttributeModificationEntity extends EquipmentAttributeModificationEntity<Boolean> {
 
diff --git a/src/main/resources/db/changelog/changesets/changelog_20260522T132309Z.xml b/src/main/resources/db/changelog/changesets/changelog_20260522T132309Z.xml
new file mode 100644
index 000000000..3fe2d4a97
--- /dev/null
+++ b/src/main/resources/db/changelog/changesets/changelog_20260522T132309Z.xml
@@ -0,0 +1,18 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+    <changeSet author="lesoteti (generated)" id="1779456210794-3">
+        <createIndex indexName="boolean_equipment_attribute_modif_vl_topology_modif_id_idx" tableName="boolean_equipment_attribute_modification">
+            <column name="voltage_level_topology_modification_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1779456210794-4">
+        <createIndex indexName="limits_property_modification_operational_limit_group_id_idx" tableName="limits_property_modification">
+            <column name="operational_limit_group_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="lesoteti (generated)" id="1779456210794-5">
+        <createIndex indexName="modification_application_modification_uuid_idx" tableName="modification_application">
+            <column name="modification_uuid"/>
+        </createIndex>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml
index 919555583..2752eba51 100644
--- a/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -483,3 +483,6 @@ databaseChangeLog:
   - include:
       file: changesets/changelog_20260515T125415Z.xml
       relativeToChangelogFile: true
+  - include:
+      file: changesets/changelog_20260522T132309Z.xml
+      relativeToChangelogFile: true