diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/BranchCreationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/BranchCreationEntity.java
index 9d8cf0b7e..84038b1a9 100644
--- a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/BranchCreationEntity.java
+++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/BranchCreationEntity.java
@@ -71,7 +71,7 @@ public class BranchCreationEntity extends EquipmentCreationEntity {
     @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
     @JoinTable(
             joinColumns = @JoinColumn(name = "branch_id"), foreignKey = @ForeignKey(name = "branch_id_fk"),
-            inverseJoinColumns = @JoinColumn(name = "operational_limits_groups_id"), inverseForeignKey = @ForeignKey(name = "operational_limits_groups_id_fk"))
+            inverseJoinColumns = @JoinColumn(name = "operational_limits_groups_id"), inverseForeignKey = @ForeignKey(name = "operational_limits_groups_creation_id_fk"))
     @OrderColumn(name = "pos_operationalLimitsGroups")
     private List<OperationalLimitsGroupEntity> operationalLimitsGroups;
 
diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/VscCreationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/VscCreationEntity.java
index e2caddaee..95b09e054 100644
--- a/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/VscCreationEntity.java
+++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/creation/VscCreationEntity.java
@@ -60,7 +60,7 @@ public class VscCreationEntity extends EquipmentCreationEntity {
             name = "converter_station_1_id",
             referencedColumnName = "id",
             foreignKey = @ForeignKey(
-                    name = "converter_station_1_id_fk"
+                    name = "converter_station_creation_1_id_fk"
             ))
     private ConverterStationCreationEntity converterStation1;
 
@@ -69,7 +69,7 @@ public class VscCreationEntity extends EquipmentCreationEntity {
             name = "converter_station_2_id",
             referencedColumnName = "id",
             foreignKey = @ForeignKey(
-                    name = "converter_station_2_id_fk"
+                    name = "converter_station_creation_2_id_fk"
             ))
     private ConverterStationCreationEntity converterStation2;
 
diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BranchModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BranchModificationEntity.java
index 0b4127352..395dd06f5 100644
--- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BranchModificationEntity.java
+++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BranchModificationEntity.java
@@ -43,7 +43,7 @@ public class BranchModificationEntity extends BasicEquipmentModificationEntity {
     @OneToMany(cascade = CascadeType.ALL, orphanRemoval = true)
     @JoinTable(
             joinColumns = @JoinColumn(name = "branch_id"), foreignKey = @ForeignKey(name = "branch_modification_id_fk"),
-            inverseJoinColumns = @JoinColumn(name = "operational_limits_groups_id"), inverseForeignKey = @ForeignKey(name = "operational_limits_groups_id_fk"))
+            inverseJoinColumns = @JoinColumn(name = "operational_limits_groups_id"), inverseForeignKey = @ForeignKey(name = "operational_limits_groups_modification_id_fk"))
     @OrderColumn(name = "pos_operationalLimitsGroups")
     private List<OperationalLimitsGroupModificationEntity> operationalLimitsGroups;
 
diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/EquipmentModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/EquipmentModificationEntity.java
index 050d0be72..d1e027806 100644
--- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/EquipmentModificationEntity.java
+++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/EquipmentModificationEntity.java
@@ -26,7 +26,7 @@ public class EquipmentModificationEntity extends ModificationEntity {
     private String equipmentId;
 
     @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, orphanRemoval = true)
-    @JoinColumn(name = "equipment_modification_id")
+    @JoinColumn(name = "equipment_modification_id", foreignKey = @ForeignKey(value = ConstraintMode.NO_CONSTRAINT))
     @OrderColumn(name = "insert_position")
     private List<FreePropertyEntity> properties;
 
diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VscModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VscModificationEntity.java
index 87c5e4e4f..c026baee7 100644
--- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VscModificationEntity.java
+++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/VscModificationEntity.java
@@ -104,7 +104,7 @@ public class VscModificationEntity extends BasicEquipmentModificationEntity {
             name = "converter_station_1_id",
             referencedColumnName = "id",
             foreignKey = @ForeignKey(
-                    name = "converter_station_1_id_fk"
+                    name = "converter_station_modification_1_id_fk"
             ))
     private ConverterStationModificationEntity converterStation1;
 
@@ -113,7 +113,7 @@ public class VscModificationEntity extends BasicEquipmentModificationEntity {
             name = "converter_station_2_id",
             referencedColumnName = "id",
             foreignKey = @ForeignKey(
-                    name = "converter_station_2_id_fk"
+                    name = "converter_station_modification_2_id_fk"
             ))
     private ConverterStationModificationEntity converterStation2;
 
diff --git a/src/main/resources/db/changelog/changesets/changelog_20251021T145023Z.xml b/src/main/resources/db/changelog/changesets/changelog_20251021T145023Z.xml
new file mode 100644
index 000000000..3d3f6a84b
--- /dev/null
+++ b/src/main/resources/db/changelog/changesets/changelog_20251021T145023Z.xml
@@ -0,0 +1,24 @@
+<?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="rehiligha (generated)" id="1761058240544-39">
+        <addForeignKeyConstraint baseColumnNames="id" baseTableName="battery_creation" constraintName="batteryCreation_id_fk_constraint" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="modification" validate="true"/>
+    </changeSet>
+    <changeSet author="rehiligha (generated)" id="1761058240544-40">
+        <addForeignKeyConstraint baseColumnNames="converter_station_1_id" baseTableName="vsc_modification" constraintName="converter_station_modification_1_id_fk" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="converter_station_modification" validate="true"/>
+    </changeSet>
+    <changeSet author="rehiligha (generated)" id="1761058240544-41">
+        <addForeignKeyConstraint baseColumnNames="converter_station_2_id" baseTableName="vsc_modification" constraintName="converter_station_modification_2_id_fk" deferrable="false" initiallyDeferred="false" referencedColumnNames="id" referencedTableName="converter_station_modification" validate="true"/>
+    </changeSet>
+    <changeSet author="rehiligha (generated)" id="1761058240544-42">
+        <addForeignKeyConstraint baseColumnNames="operational_limits_groups_id" baseTableName="line_modification_operational_limits_groups" constraintName="operational_limits_groups_line_modification_id_fk" deferrable="false" initiallyDeferred="false" referencedColumnNames="uuid" referencedTableName="operational_limits_group_modification" validate="true"/>
+    </changeSet>
+    <changeSet author="rehiligha (generated)" id="1761058240544-43">
+        <addForeignKeyConstraint baseColumnNames="operational_limits_groups_id" baseTableName="two_windings_transformer_modification_operational_limits_groups" constraintName="operational_limits_groups_twt_modification_id_fk" deferrable="false" initiallyDeferred="false" referencedColumnNames="uuid" referencedTableName="operational_limits_group_modification" validate="true"/>
+    </changeSet>
+    <changeSet author="rehiligha (generated)" id="1761058240544-44">
+        <dropForeignKeyConstraint baseTableName="TABULAR_PROPERTY" constraintName="FK1T4R9ETM29SNITYOPHIVGNKCE"/>
+    </changeSet>
+    <changeSet author="rehiligha (generated)" id="1761058240544-45">
+        <dropForeignKeyConstraint baseTableName="FREE_PROPERTY" constraintName="FK3WBC92CP7WLVBA202QX7LDY6N"/>
+    </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 8ad4fa74e..b1460262d 100644
--- a/src/main/resources/db/changelog/db.changelog-master.yaml
+++ b/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -423,4 +423,8 @@ databaseChangeLog:
       relativeToChangelogFile: true
   - include:
       file: changesets/changelog_20250930T132326Z.xml
-      relativeToChangelogFile: true
\ No newline at end of file
+      relativeToChangelogFile: true
+  - include:
+      file: changesets/changelog_20251021T145023Z.xml
+      relativeToChangelogFile: true
+