diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/control_objective/ControlObjective.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/control_objective/ControlObjective.kt
index 9e36b69290..754be9e5a3 100644
--- a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/control_objective/ControlObjective.kt
+++ b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/entities/control_objective/ControlObjective.kt
@@ -8,4 +8,5 @@ data class ControlObjective(
     val targetNumberOfControlsAtSea: Int,
     val targetNumberOfControlsAtPort: Int,
     val controlPriorityLevel: Double,
+    val infringementRiskLevel: Double,
 )
diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/repositories/ControlObjectivesRepository.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/repositories/ControlObjectivesRepository.kt
index be3b496fbe..c52a171975 100644
--- a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/repositories/ControlObjectivesRepository.kt
+++ b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/repositories/ControlObjectivesRepository.kt
@@ -12,6 +12,7 @@ interface ControlObjectivesRepository {
         targetNumberOfControlsAtSea: Int?,
         targetNumberOfControlsAtPort: Int?,
         controlPriorityLevel: Double?,
+        infringementRiskLevel: Double?,
     )
 
     fun delete(id: Int)
diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/control_objective/AddControlObjective.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/control_objective/AddControlObjective.kt
index af67fdcbeb..bd2bf54268 100644
--- a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/control_objective/AddControlObjective.kt
+++ b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/control_objective/AddControlObjective.kt
@@ -21,6 +21,7 @@ class AddControlObjective(
                 targetNumberOfControlsAtPort = 0,
                 targetNumberOfControlsAtSea = 0,
                 controlPriorityLevel = 1.0,
+                infringementRiskLevel = 2.0,
             ),
         )
 }
diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/control_objective/UpdateControlObjective.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/control_objective/UpdateControlObjective.kt
index ef2d810bcc..f41b7a6757 100644
--- a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/control_objective/UpdateControlObjective.kt
+++ b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/control_objective/UpdateControlObjective.kt
@@ -14,9 +14,13 @@ class UpdateControlObjective(
         targetNumberOfControlsAtSea: Int?,
         targetNumberOfControlsAtPort: Int?,
         controlPriorityLevel: Double?,
+        infringementRiskLevel: Double?,
     ) {
         require(
-            targetNumberOfControlsAtSea != null || targetNumberOfControlsAtPort != null || controlPriorityLevel != null,
+            targetNumberOfControlsAtSea != null ||
+                targetNumberOfControlsAtPort != null ||
+                controlPriorityLevel != null ||
+                infringementRiskLevel != null
         ) {
             "No value to update"
         }
@@ -26,6 +30,7 @@ class UpdateControlObjective(
             targetNumberOfControlsAtSea,
             targetNumberOfControlsAtPort,
             controlPriorityLevel,
+            infringementRiskLevel,
         )
     }
 }
diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/ControlObjectiveAdminController.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/ControlObjectiveAdminController.kt
index 0bd53aea35..f4921223e2 100644
--- a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/ControlObjectiveAdminController.kt
+++ b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/ControlObjectiveAdminController.kt
@@ -55,6 +55,7 @@ class ControlObjectiveAdminController(
             targetNumberOfControlsAtSea = updateControlObjectiveData.targetNumberOfControlsAtSea,
             targetNumberOfControlsAtPort = updateControlObjectiveData.targetNumberOfControlsAtPort,
             controlPriorityLevel = updateControlObjectiveData.controlPriorityLevel,
+            infringementRiskLevel = updateControlObjectiveData.infringementRiskLevel,
         )
     }
 
diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/input/UpdateControlObjectiveDataInput.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/input/UpdateControlObjectiveDataInput.kt
index 27b9655bc3..6ad39c409f 100644
--- a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/input/UpdateControlObjectiveDataInput.kt
+++ b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/input/UpdateControlObjectiveDataInput.kt
@@ -4,4 +4,5 @@ data class UpdateControlObjectiveDataInput(
     var targetNumberOfControlsAtSea: Int? = null,
     var targetNumberOfControlsAtPort: Int? = null,
     var controlPriorityLevel: Double? = null,
+    var infringementRiskLevel: Double? = null,
 )
diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/outputs/ControlObjectiveDataOutput.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/outputs/ControlObjectiveDataOutput.kt
index 9ecccef869..6815f06404 100644
--- a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/outputs/ControlObjectiveDataOutput.kt
+++ b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/outputs/ControlObjectiveDataOutput.kt
@@ -10,6 +10,7 @@ data class ControlObjectiveDataOutput(
     val targetNumberOfControlsAtSea: Int,
     val targetNumberOfControlsAtPort: Int,
     val controlPriorityLevel: Double,
+    val infringementRiskLevel: Double,
 ) {
     companion object {
         fun fromControlObjective(controlObjective: ControlObjective): ControlObjectiveDataOutput {
@@ -25,6 +26,7 @@ data class ControlObjectiveDataOutput(
                 targetNumberOfControlsAtSea = controlObjective.targetNumberOfControlsAtSea,
                 targetNumberOfControlsAtPort = controlObjective.targetNumberOfControlsAtPort,
                 controlPriorityLevel = controlObjective.controlPriorityLevel,
+                infringementRiskLevel = controlObjective.infringementRiskLevel,
             )
         }
     }
diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/entities/ControlObjectivesEntity.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/entities/ControlObjectivesEntity.kt
index 6e37c8145d..a0c1290a8a 100644
--- a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/entities/ControlObjectivesEntity.kt
+++ b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/entities/ControlObjectivesEntity.kt
@@ -24,7 +24,9 @@ data class ControlObjectivesEntity(
     val targetNumberOfControlsAtPort: Int,
     @Column(name = "control_priority_level")
     val controlPriorityLevel: Double,
-) {
+    @Column(name = "infringement_risk_level")
+    val infringementRiskLevel: Double,
+    ) {
     fun toControlObjective() =
         ControlObjective(
             id = id,
@@ -34,17 +36,6 @@ data class ControlObjectivesEntity(
             targetNumberOfControlsAtSea = targetNumberOfControlsAtSea,
             targetNumberOfControlsAtPort = targetNumberOfControlsAtPort,
             controlPriorityLevel = controlPriorityLevel,
+            infringementRiskLevel = infringementRiskLevel,
         )
-
-    companion object {
-        fun fromControlObjective(controlObjective: ControlObjective): ControlObjectivesEntity =
-            ControlObjectivesEntity(
-                facade = Seafront.from(controlObjective.facade).toString(),
-                segment = controlObjective.segment,
-                year = controlObjective.year,
-                targetNumberOfControlsAtSea = controlObjective.targetNumberOfControlsAtSea,
-                targetNumberOfControlsAtPort = controlObjective.targetNumberOfControlsAtPort,
-                controlPriorityLevel = controlObjective.controlPriorityLevel,
-            )
-    }
 }
diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaControlObjectivesRepository.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaControlObjectivesRepository.kt
index 7b040f33b6..cebfc96420 100644
--- a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaControlObjectivesRepository.kt
+++ b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaControlObjectivesRepository.kt
@@ -25,12 +25,17 @@ class JpaControlObjectivesRepository(
         targetNumberOfControlsAtSea: Int?,
         targetNumberOfControlsAtPort: Int?,
         controlPriorityLevel: Double?,
+        infringementRiskLevel: Double?,
     ) {
         try {
             controlPriorityLevel?.let {
                 dbControlObjectivesRepository.updateControlPriorityLevel(id, it)
             }
 
+            infringementRiskLevel?.let {
+                    dbControlObjectivesRepository.updateInfringementRiskLevel(id, it)
+            }
+
             targetNumberOfControlsAtSea?.let {
                 dbControlObjectivesRepository.updateTargetNumberOfControlsAtSea(id, it)
             }
@@ -61,6 +66,7 @@ class JpaControlObjectivesRepository(
             controlObjective.targetNumberOfControlsAtSea,
             controlObjective.targetNumberOfControlsAtPort,
             controlObjective.controlPriorityLevel,
+            controlObjective.infringementRiskLevel,
         )
 
         return dbControlObjectivesRepository.findByFacadeAndSegmentAndYearEquals(
diff --git a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/interfaces/DBControlObjectivesRepository.kt b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/interfaces/DBControlObjectivesRepository.kt
index 12d4faee91..5b0b31c3fb 100644
--- a/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/interfaces/DBControlObjectivesRepository.kt
+++ b/backend/src/main/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/interfaces/DBControlObjectivesRepository.kt
@@ -36,6 +36,16 @@ interface DBControlObjectivesRepository : CrudRepository<ControlObjectivesEntity
         controlPriorityLevel: Double,
     )
 
+    @Modifying(clearAutomatically = true)
+    @Query(
+        value = "UPDATE control_objectives SET infringement_risk_level = :infringementRiskLevel WHERE id = :controlObjectiveId",
+        nativeQuery = true,
+    )
+    fun updateInfringementRiskLevel(
+        controlObjectiveId: Int,
+        infringementRiskLevel: Double,
+    )
+
     @Query
     fun findAllByYearEquals(year: Int): List<ControlObjectivesEntity>
 
@@ -45,10 +55,25 @@ interface DBControlObjectivesRepository : CrudRepository<ControlObjectivesEntity
     @Modifying(clearAutomatically = true)
     @Query(
         value = """
-    INSERT INTO control_objectives (facade, segment, year, target_number_of_controls_at_sea, target_number_of_controls_at_port, control_priority_level)
-        SELECT facade, segment, :nextYear, target_number_of_controls_at_sea, target_number_of_controls_at_port, control_priority_level
-        FROM control_objectives AS old
-        WHERE old.year = :currentYear
+    INSERT INTO control_objectives (
+        facade,
+        segment,
+        year,
+        target_number_of_controls_at_sea,
+        target_number_of_controls_at_port,
+        control_priority_level,
+        infringement_risk_level
+    )
+    SELECT
+        facade,
+        segment,
+        :nextYear,
+        target_number_of_controls_at_sea,
+        target_number_of_controls_at_port,
+        control_priority_level,
+        infringement_risk_level
+    FROM control_objectives AS old
+    WHERE old.year = :currentYear
     """,
         nativeQuery = true,
     )
@@ -61,14 +86,23 @@ interface DBControlObjectivesRepository : CrudRepository<ControlObjectivesEntity
     @Query(
         """
         INSERT INTO
-            control_objectives
+            control_objectives (
+                facade,
+                segment,
+                year,
+                target_number_of_controls_at_sea,
+                target_number_of_controls_at_port,
+                control_priority_level,
+                infringement_risk_level
+            )
         VALUES (
             cast(:facade as facade),
             :segment,
             :year,
             :targetNumberOfControlsAtSea,
             :targetNumberOfControlsAtPort,
-            :controlPriorityLevel
+            :controlPriorityLevel,
+            :infringementRiskLevel
         )
     """,
         nativeQuery = true,
@@ -80,6 +114,7 @@ interface DBControlObjectivesRepository : CrudRepository<ControlObjectivesEntity
         targetNumberOfControlsAtSea: Int,
         targetNumberOfControlsAtPort: Int,
         controlPriorityLevel: Double,
+        infringementRiskLevel: Double,
     )
 
     @Query(
diff --git a/backend/src/main/resources/db/migration/internal/V0.348__Update_control_objectives_table.sql b/backend/src/main/resources/db/migration/internal/V0.348__Update_control_objectives_table.sql
new file mode 100644
index 0000000000..8ecec64cf1
--- /dev/null
+++ b/backend/src/main/resources/db/migration/internal/V0.348__Update_control_objectives_table.sql
@@ -0,0 +1,2 @@
+ALTER TABLE public.control_objectives
+ADD COLUMN infringement_risk_level DOUBLE PRECISION NOT NULL DEFAULT 2.0;
diff --git a/backend/src/main/resources/db/migration/internal/V0.349__Update_current_segments_table.sql b/backend/src/main/resources/db/migration/internal/V0.349__Update_current_segments_table.sql
new file mode 100644
index 0000000000..dce716145f
--- /dev/null
+++ b/backend/src/main/resources/db/migration/internal/V0.349__Update_current_segments_table.sql
@@ -0,0 +1,3 @@
+ALTER TABLE public.current_segments
+    ADD COLUMN infringement_risk_level DOUBLE PRECISION NOT NULL DEFAULT 2.0,
+    ADD COLUMN segment_highest_infringement_risk VARCHAR(100);
diff --git a/backend/src/main/resources/db/migration/internal/V0.350__Update_risk_factors_table.sql b/backend/src/main/resources/db/migration/internal/V0.350__Update_risk_factors_table.sql
new file mode 100644
index 0000000000..393a32f37b
--- /dev/null
+++ b/backend/src/main/resources/db/migration/internal/V0.350__Update_risk_factors_table.sql
@@ -0,0 +1,9 @@
+ALTER TABLE public.risk_factors
+    ADD COLUMN recent_segments_probability_risk_factor DOUBLE PRECISION NOT NULL DEFAULT 2.0,
+    ADD COLUMN usual_segments_probability_risk_factor DOUBLE PRECISION NOT NULL DEFAULT 2.0,
+    ADD COLUMN infringement_risk_level DOUBLE PRECISION NOT NULL DEFAULT 2.0,
+    ADD COLUMN segment_highest_infringement_risk VARCHAR(100),
+    ADD COLUMN recent_segments_infringement_risk_level DOUBLE PRECISION NOT NULL DEFAULT 2.0,
+    ADD COLUMN recent_segment_highest_infringement_risk VARCHAR(100),
+    ADD COLUMN usual_segments_infringement_risk_level DOUBLE PRECISION NOT NULL DEFAULT 2.0,
+    ADD COLUMN usual_segment_highest_infringement_risk VARCHAR(100);
diff --git a/backend/src/main/resources/db/testdata/V666.36__Insert_dummy_control_objectives.sql b/backend/src/main/resources/db/testdata/V666.36__Insert_dummy_control_objectives.sql
new file mode 100644
index 0000000000..b3a0152dec
--- /dev/null
+++ b/backend/src/main/resources/db/testdata/V666.36__Insert_dummy_control_objectives.sql
@@ -0,0 +1,11 @@
+UPDATE control_objectives
+SET infringement_risk_level = 3.0
+WHERE segment LIKE 'NWW%';
+
+UPDATE control_objectives
+SET infringement_risk_level = 4.0
+WHERE segment LIKE 'MED%';
+
+UPDATE control_objectives
+SET infringement_risk_level = 1.0
+WHERE segment LIKE 'NS%';
diff --git a/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/UpdateControlObjectiveUTests.kt b/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/UpdateControlObjectiveUTests.kt
index d5aae5b05d..6415ddffae 100644
--- a/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/UpdateControlObjectiveUTests.kt
+++ b/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/UpdateControlObjectiveUTests.kt
@@ -19,7 +19,7 @@ class UpdateControlObjectiveUTests {
         // When
         val throwable =
             catchThrowable {
-                UpdateControlObjective(controlObjectivesRepository).execute(1, null, null, null)
+                UpdateControlObjective(controlObjectivesRepository).execute(1, null, null, null, null)
             }
 
         // Then
@@ -32,7 +32,7 @@ class UpdateControlObjectiveUTests {
         // When
         val throwable =
             catchThrowable {
-                UpdateControlObjective(controlObjectivesRepository).execute(1, 123, null, null)
+                UpdateControlObjective(controlObjectivesRepository).execute(1, 123, null, null, null)
             }
 
         // Then
diff --git a/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/prior_notification/ComputeRiskFactorUTests.kt b/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/prior_notification/ComputeRiskFactorUTests.kt
index ae729a07d0..fc2a10b98f 100644
--- a/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/prior_notification/ComputeRiskFactorUTests.kt
+++ b/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/domain/use_cases/prior_notification/ComputeRiskFactorUTests.kt
@@ -198,6 +198,7 @@ class ComputeRiskFactorUTests {
                     controlPriorityLevel = 1.2,
                     targetNumberOfControlsAtSea = 1,
                     targetNumberOfControlsAtPort = 2,
+                    infringementRiskLevel = 3.0,
                 ),
                 ControlObjective(
                     facade = "MEMN",
@@ -206,6 +207,7 @@ class ComputeRiskFactorUTests {
                     controlPriorityLevel = 1.5,
                     targetNumberOfControlsAtSea = 1,
                     targetNumberOfControlsAtPort = 2,
+                    infringementRiskLevel = 1.0,
                 ),
                 ControlObjective(
                     facade = "MED",
@@ -214,6 +216,7 @@ class ComputeRiskFactorUTests {
                     controlPriorityLevel = 1.2,
                     targetNumberOfControlsAtSea = 1,
                     targetNumberOfControlsAtPort = 2,
+                    infringementRiskLevel = 4.0,
                 ),
             )
         val port = PortFaker.fakePort(locode = portLocode, name = "Port name", facade = "MED")
@@ -286,6 +289,7 @@ class ComputeRiskFactorUTests {
                     controlPriorityLevel = 1.2,
                     targetNumberOfControlsAtSea = 1,
                     targetNumberOfControlsAtPort = 2,
+                    infringementRiskLevel = 2.0,
                 ),
                 ControlObjective(
                     facade = "MEMN",
@@ -294,6 +298,7 @@ class ComputeRiskFactorUTests {
                     controlPriorityLevel = 1.5,
                     targetNumberOfControlsAtSea = 1,
                     targetNumberOfControlsAtPort = 2,
+                    infringementRiskLevel = 3.0,
                 ),
             )
         val port = PortFaker.fakePort(locode = portLocode, name = "Port name", facade = "MED")
diff --git a/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/ControlObjectiveAdminControllerITests.kt b/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/ControlObjectiveAdminControllerITests.kt
index 38faf094d8..4be268683b 100644
--- a/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/ControlObjectiveAdminControllerITests.kt
+++ b/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/api/bff/ControlObjectiveAdminControllerITests.kt
@@ -101,6 +101,7 @@ class ControlObjectiveAdminControllerITests {
                     targetNumberOfControlsAtSea = 23,
                     targetNumberOfControlsAtPort = 102,
                     controlPriorityLevel = 1.0,
+                    infringementRiskLevel = 1.5,
                     year = 2021,
                 ),
                 ControlObjective(
@@ -110,6 +111,7 @@ class ControlObjectiveAdminControllerITests {
                     targetNumberOfControlsAtSea = 23,
                     targetNumberOfControlsAtPort = 102,
                     controlPriorityLevel = 1.0,
+                    infringementRiskLevel = 1.5,
                     year = 2021,
                 ),
                 ControlObjective(
@@ -119,6 +121,7 @@ class ControlObjectiveAdminControllerITests {
                     targetNumberOfControlsAtSea = 23,
                     targetNumberOfControlsAtPort = 102,
                     controlPriorityLevel = 1.0,
+                    infringementRiskLevel = 1.5,
                     year = 2021,
                 ),
             ),
diff --git a/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaControlObjectivesRepositoryITests.kt b/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaControlObjectivesRepositoryITests.kt
index fd22b6cda3..fa30ad3ba4 100644
--- a/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaControlObjectivesRepositoryITests.kt
+++ b/backend/src/test/kotlin/fr/gouv/cnsp/monitorfish/infrastructure/database/repositories/JpaControlObjectivesRepositoryITests.kt
@@ -68,6 +68,7 @@ class JpaControlObjectivesRepositoryITests : AbstractDBTests() {
             targetNumberOfControlsAtPort = 153,
             targetNumberOfControlsAtSea = null,
             controlPriorityLevel = null,
+            infringementRiskLevel = null,
         )
 
         // Then
@@ -88,6 +89,7 @@ class JpaControlObjectivesRepositoryITests : AbstractDBTests() {
             targetNumberOfControlsAtPort = null,
             targetNumberOfControlsAtSea = 10,
             controlPriorityLevel = null,
+            infringementRiskLevel = null,
         )
 
         // Then
@@ -108,6 +110,7 @@ class JpaControlObjectivesRepositoryITests : AbstractDBTests() {
             targetNumberOfControlsAtPort = null,
             targetNumberOfControlsAtSea = null,
             controlPriorityLevel = 2.0,
+            infringementRiskLevel = null,
         )
 
         // Then
@@ -115,6 +118,27 @@ class JpaControlObjectivesRepositoryITests : AbstractDBTests() {
         assertThat(updatedControlObjective?.controlPriorityLevel).isEqualTo(2.0)
     }
 
+    @Test
+    @Transactional
+    fun `update Should update infringementRiskLevel When not null`() {
+        // Given
+        val controlObjectives = jpaControlObjectivesRepository.findAllByYear(lastYear)
+
+        // When
+        assertThat(controlObjectives.find { it.id == 9 }?.infringementRiskLevel).isEqualTo(4.0)
+        jpaControlObjectivesRepository.update(
+            id = 9,
+            targetNumberOfControlsAtPort = null,
+            targetNumberOfControlsAtSea = null,
+            controlPriorityLevel = null,
+            infringementRiskLevel = 3.0,
+        )
+
+        // Then
+        val updatedControlObjective = jpaControlObjectivesRepository.findAllByYear(lastYear).find { it.id == 9 }
+        assertThat(updatedControlObjective?.infringementRiskLevel).isEqualTo(3.0)
+    }
+
     @Test
     @Transactional
     fun `add Should add a new control objective to a facade`() {
@@ -131,13 +155,18 @@ class JpaControlObjectivesRepositoryITests : AbstractDBTests() {
                 targetNumberOfControlsAtSea = 25,
                 targetNumberOfControlsAtPort = 64,
                 controlPriorityLevel = 2.0,
+                infringementRiskLevel = 3.0
             ),
         )
 
         // Then
         val updatedControlObjectives = jpaControlObjectivesRepository.findAllByYear(lastYear)
         assertThat(updatedControlObjectives).hasSize(63)
+        assertThat(updatedControlObjectives.filter { it.segment=="SEGMENT" }).hasSize(1)
         assertThat(updatedControlObjectives.find { it.segment == "SEGMENT" }?.targetNumberOfControlsAtSea).isEqualTo(25)
+        assertThat(updatedControlObjectives.find { it.segment == "SEGMENT" }?.targetNumberOfControlsAtPort).isEqualTo(64)
+        assertThat(updatedControlObjectives.find { it.segment == "SEGMENT" }?.controlPriorityLevel).isEqualTo(2.0)
+        assertThat(updatedControlObjectives.find { it.segment == "SEGMENT" }?.infringementRiskLevel).isEqualTo(3.0)
     }
 
     @Test
@@ -154,7 +183,9 @@ class JpaControlObjectivesRepositoryITests : AbstractDBTests() {
         assertThat(jpaControlObjectivesRepository.findAllByYear(lastYear)).hasSize(62)
         val updatedControlObjectives = jpaControlObjectivesRepository.findAllByYear(nextYear)
         assertThat(updatedControlObjectives).hasSize(62)
-        assertThat(updatedControlObjectives.first().id).isEqualTo(144)
+        assertThat(updatedControlObjectives.sortedBy{ it.id }.first().id).isEqualTo(144)
+        assertThat(updatedControlObjectives.find{ it.segment == "SWW01/08" }?.targetNumberOfControlsAtSea).isEqualTo(139)
+        assertThat(updatedControlObjectives.find{ it.segment == "MED05" }?.infringementRiskLevel).isEqualTo(4.0)
         assertThat(updatedControlObjectives.first().year).isEqualTo(nextYear)
     }
 }
diff --git a/frontend/src/features/ControlObjective/components/ControlObjectiveTable/InfringementRiskLevelCell.tsx b/frontend/src/features/ControlObjective/components/ControlObjectiveTable/InfringementRiskLevelCell.tsx
new file mode 100644
index 0000000000..adb3e81cd1
--- /dev/null
+++ b/frontend/src/features/ControlObjective/components/ControlObjectiveTable/InfringementRiskLevelCell.tsx
@@ -0,0 +1,44 @@
+import { Select } from '@mtes-mct/monitor-ui'
+import { Table } from 'rsuite'
+import styled from 'styled-components'
+
+const { Cell } = Table
+export function InfringementRiskLevelCell({ dataKey, onChange, ...props }) {
+  const { rowData } = props
+  const dataCy = `row-${rowData.id}-${dataKey}`
+
+  return (
+    // eslint-disable-next-line react/jsx-props-no-spreading
+    <StyledCell key={rowData.id} {...props} className="table-content-editing">
+      <Select
+        cleanable={false}
+        container={document.body}
+        data-cy={dataCy}
+        isLabelHidden
+        isTransparent
+        label="Tendance infractiogène"
+        name="infringementRiskLevel"
+        onChange={value => {
+          const infringementRiskLevel = value ?? ''
+          if (onChange) {
+            onChange(rowData.id, dataKey, infringementRiskLevel)
+          }
+        }}
+        options={[
+          { label: '1', value: 1 },
+          { label: '2', value: 2 },
+          { label: '3', value: 3 },
+          { label: '4', value: 4 }
+        ]}
+        searchable={false}
+        value={rowData[dataKey]}
+      />
+    </StyledCell>
+  )
+}
+
+const StyledCell = styled(Cell)`
+  > div {
+    padding: 4px 0 0 0 !important;
+  }
+`
diff --git a/frontend/src/features/ControlObjective/components/ControlObjectiveTable/SeafrontControlObjectives.tsx b/frontend/src/features/ControlObjective/components/ControlObjectiveTable/SeafrontControlObjectives.tsx
index e17331a039..36137ccf91 100644
--- a/frontend/src/features/ControlObjective/components/ControlObjectiveTable/SeafrontControlObjectives.tsx
+++ b/frontend/src/features/ControlObjective/components/ControlObjectiveTable/SeafrontControlObjectives.tsx
@@ -14,6 +14,7 @@ import styled from 'styled-components'
 import { useDebouncedCallback } from 'use-debounce'
 
 import { ControlPriorityCell } from './ControlPriorityCell'
+import { InfringementRiskLevelCell } from './InfringementRiskLevelCell'
 import { LoadingSpinnerWall } from '../../../../ui/LoadingSpinnerWall'
 import { useGetFleetSegmentsQuery } from '../../../FleetSegment/apis'
 import {
@@ -77,6 +78,7 @@ export function SeafrontControlObjectives({ data, facade, title, year }: Seafron
           controlPriorityLevel: 1,
           facade,
           id: newId,
+          infringementRiskLevel: 2,
           segment: nextSegment,
           target: 1,
           targetNumberOfControlsAtPort: 0,
@@ -126,6 +128,7 @@ export function SeafrontControlObjectives({ data, facade, title, year }: Seafron
     ) => {
       const updatedFields = {
         controlPriorityLevel: null,
+        infringementRiskLevel: null,
         targetNumberOfControlsAtPort: null,
         targetNumberOfControlsAtSea: null,
         // eslint-disable-next-line sort-keys-fix/sort-keys-fix
@@ -220,7 +223,7 @@ export function SeafrontControlObjectives({ data, facade, title, year }: Seafron
         rowKey="id"
         sortColumn={sortColumn}
         sortType={sortType}
-        width={795}
+        width={905}
       >
         <Table.Column sortable width={100}>
           <Table.HeaderCell>Segment</Table.HeaderCell>
@@ -273,6 +276,16 @@ export function SeafrontControlObjectives({ data, facade, title, year }: Seafron
           />
         </Table.Column>
 
+        <Table.Column width={100}>
+          <Table.HeaderCell>N. infraction</Table.HeaderCell>
+          <InfringementRiskLevelCell
+            dataKey="infringementRiskLevel"
+            onChange={(id, key, value) =>
+              handleChangeModifiableKey(id, key, value, controlObjectivesWithMaybeFleetSegment)
+            }
+          />
+        </Table.Column>
+
         <Table.Column width={34}>
           <Table.HeaderCell> </Table.HeaderCell>
           <DeleteCell dataKey="id" id="id" onClick={deleteControlObjectiveRow} />
diff --git a/frontend/src/features/ControlObjective/types.ts b/frontend/src/features/ControlObjective/types.ts
index ec9818d62b..2509790795 100644
--- a/frontend/src/features/ControlObjective/types.ts
+++ b/frontend/src/features/ControlObjective/types.ts
@@ -4,6 +4,7 @@ export type ControlObjective = {
   controlPriorityLevel: Float<number>
   facade: string
   id: number
+  infringementRiskLevel: Float<number>
   segment: string
   targetNumberOfControlsAtPort: number
   targetNumberOfControlsAtSea: number
@@ -12,6 +13,7 @@ export type ControlObjective = {
 
 export type UpdateControlObjectivePayload = {
   controlPriorityLevel: Float<number> | null
+  infringementRiskLevel: Float<number> | null
   targetNumberOfControlsAtPort: Integer<number> | null
   targetNumberOfControlsAtSea: Integer<number> | null
 }
diff --git a/pipeline/config.py b/pipeline/config.py
index e9aa5b0389..198a07d5ed 100644
--- a/pipeline/config.py
+++ b/pipeline/config.py
@@ -145,6 +145,7 @@
     "control_rate_risk_factor": 4,
     "infraction_rate_risk_factor": 2,
     "control_priority_level": 1,
+    "infringement_risk_level": 2,
     "impact_risk_factor": 1,
     "probability_risk_factor": 2,
     "detectability_risk_factor": 2,
@@ -167,6 +168,15 @@
 default_risk_factors["recent_segments_risk_factor"] = default_risk_factors[
     "risk_factor"
 ]
+default_risk_factors["recent_segments_infringement_risk_level"] = default_risk_factors[
+    "infringement_risk_level"
+]
+default_risk_factors["recent_segments_probability_risk_factor"] = default_risk_factors[
+    "probability_risk_factor"
+]
+default_risk_factors["recent_segments_risk_factor"] = default_risk_factors[
+    "risk_factor"
+]
 
 default_risk_factors["usual_segments_control_priority_level"] = default_risk_factors[
     "control_priority_level"
@@ -178,6 +188,14 @@
     "detectability_risk_factor"
 ]
 default_risk_factors["usual_segments_risk_factor"] = default_risk_factors["risk_factor"]
+default_risk_factors["usual_segments_infringement_risk_level"] = default_risk_factors[
+    "infringement_risk_level"
+]
+default_risk_factors["usual_segments_probability_risk_factor"] = default_risk_factors[
+    "probability_risk_factor"
+]
+default_risk_factors["usual_segments_risk_factor"] = default_risk_factors["risk_factor"]
+
 
 # BEACONS MALFUNCTIONS CONFIGURATION
 BEACONS_MAX_HOURS_WITHOUT_EMISSION_AT_SEA = 4
diff --git a/pipeline/src/flows/current_segments.py b/pipeline/src/flows/current_segments.py
index d2e1dc5c2b..dc53820537 100644
--- a/pipeline/src/flows/current_segments.py
+++ b/pipeline/src/flows/current_segments.py
@@ -7,7 +7,7 @@
 from src.processing import df_to_dict_series
 from src.shared_tasks.dates import get_current_year
 from src.shared_tasks.segments import (
-    extract_control_priorities,
+    extract_control_priorities_and_infringement_risk_levels,
     extract_segments_of_year,
 )
 
@@ -31,7 +31,10 @@ def extract_last_positions():
 
 @task
 def compute_current_segments(
-    current_catches, segments, last_positions, control_priorities
+    current_catches,
+    segments,
+    last_positions,
+    control_priorities_and_infringement_risk_levels,
 ):
     segmented_catches = (
         allocate_segments_to_catches(
@@ -116,14 +119,16 @@ def compute_current_segments(
         how="outer",
     )
 
-    # Merge façade from last positions, then control priorities
+    # Merge façade from last positions, then control priorities and infringement risk levels
     segmented_catches_with_facade = pd.merge(
         segmented_catches, last_positions, on="cfr", how="left"
     )
 
     control_priorities = (
         pd.merge(
-            segmented_catches_with_facade, control_priorities, on=["segment", "facade"]
+            segmented_catches_with_facade,
+            control_priorities_and_infringement_risk_levels,
+            on=["segment", "facade"],
         )
         .sort_values("control_priority_level", ascending=False)
         .groupby("cfr")[["cfr", "segment", "control_priority_level"]]
@@ -136,6 +141,23 @@ def compute_current_segments(
         )
     )
 
+    infringement_risk_levels = (
+        pd.merge(
+            segmented_catches_with_facade,
+            control_priorities_and_infringement_risk_levels,
+            on=["segment", "facade"],
+        )
+        .sort_values("infringement_risk_level", ascending=False)
+        .groupby("cfr")[["cfr", "segment", "infringement_risk_level"]]
+        .head(1)
+        .set_index("cfr")
+        .rename(
+            columns={
+                "segment": "segment_highest_infringement_risk",
+            }
+        )
+    )
+
     # Group catch data of each vessel in a list of dicts like
     # [{"gear": "DRB", "species": "SCE", "faoZone": "27.7", "weight": 156.2}, ...]
     catch_columns = ["gear", "fao_area", "species", "mesh", "weight"]
@@ -172,6 +194,7 @@ def compute_current_segments(
         last_logbook_report.join(species_onboard)
         .join(current_segments)
         .join(control_priorities)
+        .join(infringement_risk_levels)
         .reset_index()
     )
 
@@ -205,11 +228,16 @@ def current_segments_flow(number_of_days: int = 90):
     current_catches = extract_current_catches(number_of_days=number_of_days)
     last_positions = extract_last_positions()
     segments = extract_segments_of_year(current_year)
-    control_priorities = extract_control_priorities()
+    control_priorities_and_infringement_risk_levels = (
+        extract_control_priorities_and_infringement_risk_levels()
+    )
 
     # Transform
     current_segments = compute_current_segments(
-        current_catches, segments, last_positions, control_priorities
+        current_catches,
+        segments,
+        last_positions,
+        control_priorities_and_infringement_risk_levels,
     )
 
     # Load
diff --git a/pipeline/src/flows/enrich_logbook.py b/pipeline/src/flows/enrich_logbook.py
index e73d8a1268..bc97bb8338 100644
--- a/pipeline/src/flows/enrich_logbook.py
+++ b/pipeline/src/flows/enrich_logbook.py
@@ -27,10 +27,10 @@
 
 
 @task
-def extract_all_control_priorities():
+def extract_infringement_risk_levels():
     return extract(
         db_name="monitorfish_remote",
-        query_filepath="monitorfish/all_control_priorities.sql",
+        query_filepath="monitorfish/infringement_risk_levels.sql",
     )
 
 
@@ -147,7 +147,7 @@ def extract_pno_catches(
 def compute_pno_segments(
     pno_catches: pd.DataFrame,
     segments: pd.DataFrame,
-    all_control_priorities: pd.DataFrame,
+    infringement_risk_levels: pd.DataFrame,
 ) -> pd.DataFrame:
     """
     Computes the segments of the input PNO species and gears.
@@ -184,13 +184,13 @@ def compute_pno_segments(
           - vessel_types `List[str]` `['Fishing vessel', 'Trawler']`
           - priority `float` `1.0`
 
-        all_control_priorities (pd.DataFrame): DataFrame of control priorities.
+        infringement_risk_levels (pd.DataFrame): DataFrame of infringement risk levels.
           Must have columns:
 
           - year `int` 2022
           - facade `str` "MEMN"
           - segment `str` "SWW01"
-          - control_priority_level `float` 2.8
+          - infringement_risk_level `float` 2.8
 
     Returns:
         pd.DataFrame: DataFrame of PNOs with attributed PNO types. 1 line = 1 PNO.
@@ -209,7 +209,7 @@ def compute_pno_segments(
                     {...}
                 ]```
             - impact_risk_factor `float` `2.8`
-            - control_priority_level `float` `2.8`
+            - infringement_risk_level `float` `2.8`
     """
     unnested_gears_catches = pno_catches.explode("trip_gears")
     unnested_gears_catches["catch_id"] = range(len(unnested_gears_catches))
@@ -241,13 +241,13 @@ def compute_pno_segments(
                 ) FILTER (WHERE sc.segment IS NOT NULL)
             ) AS trip_segments,
             MAX(sc.impact_risk_factor) AS impact_risk_factor,
-            MAX(acp.control_priority_level) AS control_priority_level
+            MAX(irl.infringement_risk_level) AS infringement_risk_level
         FROM segmented_catches sc
-        LEFT JOIN all_control_priorities acp
+        LEFT JOIN infringement_risk_levels irl
         ON
-            acp.year = sc.year AND
-            acp.facade::VARCHAR = sc.facade::VARCHAR AND
-            acp.segment::VARCHAR = sc.segment::VARCHAR
+            irl.year = sc.year AND
+            irl.facade::VARCHAR = sc.facade::VARCHAR AND
+            irl.segment::VARCHAR = sc.segment::VARCHAR
         GROUP BY 1
         ORDER BY 1
     """
@@ -257,7 +257,7 @@ def compute_pno_segments(
     res = res.fillna(
         {
             "impact_risk_factor": default_risk_factors["impact_risk_factor"],
-            "control_priority_level": default_risk_factors["control_priority_level"],
+            "infringement_risk_level": default_risk_factors["infringement_risk_level"],
         }
     )
 
@@ -436,12 +436,12 @@ def compute_pno_risk_factors(
 
     res = res.fillna({**default_risk_factors})
 
-    res["probability_risk_factor"] = res["infraction_rate_risk_factor"]
-
-    res["detectability_risk_factor"] = (
-        res["control_rate_risk_factor"] * res["control_priority_level"]
+    res["probability_risk_factor"] = (
+        res["infraction_rate_risk_factor"] * res["infringement_risk_level"]
     ) ** 0.5
 
+    res["detectability_risk_factor"] = res["control_rate_risk_factor"]
+
     res["risk_factor"] = (
         (res["impact_risk_factor"] ** risk_factor_coefficients["impact"])
         * (res["probability_risk_factor"] ** risk_factor_coefficients["probability"])
@@ -458,7 +458,7 @@ def compute_pno_risk_factors(
             "probability_risk_factor",
             "detectability_risk_factor",
             "control_rate_risk_factor",
-            "control_priority_level",
+            "infringement_risk_level",
         ]
     )
 
@@ -662,7 +662,7 @@ def extract_enrich_load_logbook(
     segments: pd.DataFrame,
     pno_types: pd.DataFrame,
     control_anteriority: pd.DataFrame,
-    all_control_priorities: pd.DataFrame,
+    infringement_risk_levels: pd.DataFrame,
     pno_units_targeting_vessels: pd.DataFrame,
     pno_units_ports_and_segments_subscriptions: pd.DataFrame,
     utcnow: datetime,
@@ -697,7 +697,7 @@ def extract_enrich_load_logbook(
     pnos_with_segments = compute_pno_segments(
         pno_catches=pnos_catches,
         segments=segments,
-        all_control_priorities=all_control_priorities,
+        infringement_risk_levels=infringement_risk_levels,
     )
 
     logger.info("Computing PNO types...")
@@ -740,7 +740,7 @@ def enrich_logbook_flow(
     )
 
     segments = extract_all_segments()
-    all_control_priorities = extract_all_control_priorities()
+    infringement_risk_levels = extract_infringement_risk_levels()
     pno_types = extract_pno_types()
     control_anteriority = extract_control_anteriority()
     pno_units_targeting_vessels = extract_pno_units_targeting_vessels()
@@ -756,7 +756,7 @@ def enrich_logbook_flow(
             segments=unmapped(segments),
             pno_types=unmapped(pno_types),
             control_anteriority=unmapped(control_anteriority),
-            all_control_priorities=unmapped(all_control_priorities),
+            infringement_risk_levels=unmapped(infringement_risk_levels),
             pno_units_targeting_vessels=unmapped(pno_units_targeting_vessels),
             pno_units_ports_and_segments_subscriptions=unmapped(
                 pno_units_ports_and_segments_subscriptions
@@ -770,7 +770,7 @@ def enrich_logbook_flow(
             segments=unmapped(segments),
             pno_types=unmapped(pno_types),
             control_anteriority=unmapped(control_anteriority),
-            all_control_priorities=unmapped(all_control_priorities),
+            infringement_risk_levels=unmapped(infringement_risk_levels),
             pno_units_targeting_vessels=unmapped(pno_units_targeting_vessels),
             pno_units_ports_and_segments_subscriptions=unmapped(
                 pno_units_ports_and_segments_subscriptions
diff --git a/pipeline/src/flows/risk_factors.py b/pipeline/src/flows/risk_factors.py
index 4ca7aa3ebd..900b24b470 100644
--- a/pipeline/src/flows/risk_factors.py
+++ b/pipeline/src/flows/risk_factors.py
@@ -8,7 +8,7 @@
 from src.processing import join_on_multiple_keys
 from src.shared_tasks.dates import get_current_year
 from src.shared_tasks.segments import (
-    extract_control_priorities,
+    extract_control_priorities_and_infringement_risk_levels,
     extract_segments_of_year,
 )
 
@@ -44,10 +44,10 @@ def extract_vessels_with_current_vms_fishing_activity() -> set:
 
 
 @task
-def compute_profile_segments_impact_and_priority(
+def compute_profile_segments_risk_levels(
     profile_segments: pd.DataFrame,
     segments: pd.DataFrame,
-    control_priorities: pd.DataFrame,
+    control_priorities_and_infringement_risk_levels: pd.DataFrame,
     profile_type: VesselProfileType,
 ) -> pd.DataFrame:
     segments_column = f"{profile_type.risk_factors_prefix}segments"
@@ -60,9 +60,15 @@ def compute_profile_segments_impact_and_priority(
     segment_highest_priority_column = (
         f"{profile_type.risk_factors_prefix}segment_highest_priority"
     )
+    segment_highest_infringement_risk_column = (
+        f"{profile_type.risk_factors_prefix}segment_highest_infringement_risk"
+    )
     control_priority_level_column = (
         f"{profile_type.risk_factors_prefix}segments_control_priority_level"
     )
+    infringement_risk_level_column = (
+        f"{profile_type.risk_factors_prefix}segments_infringement_risk_level"
+    )
     gear_onboard_column = f"{profile_type.risk_factors_prefix}gear_onboard"
 
     segments_impact_dict = (
@@ -95,7 +101,9 @@ def compute_profile_segments_impact_and_priority(
 
     profile_segments_control_priorities = (
         pd.merge(
-            unnested_profile_segments, control_priorities, on=["segment", "facade"]
+            unnested_profile_segments,
+            control_priorities_and_infringement_risk_levels,
+            on=["segment", "facade"],
         )
         .sort_values("control_priority_level", ascending=False)
         .groupby("cfr")[["cfr", "segment", "control_priority_level"]]
@@ -109,11 +117,30 @@ def compute_profile_segments_impact_and_priority(
         )
     )
 
+    profile_segments_infringement_risk_level = (
+        pd.merge(
+            unnested_profile_segments,
+            control_priorities_and_infringement_risk_levels,
+            on=["segment", "facade"],
+        )
+        .sort_values("infringement_risk_level", ascending=False)
+        .groupby("cfr")[["cfr", "segment", "infringement_risk_level"]]
+        .head(1)
+        .set_index("cfr")
+        .rename(
+            columns={
+                "segment": segment_highest_infringement_risk_column,
+                "infringement_risk_level": infringement_risk_level_column,
+            }
+        )
+    )
+
     res = (
         profile_segments.rename(columns={"segments": segments_column})
         .set_index("cfr")
         .join(profile_segments_impact)
         .join(profile_segments_control_priorities)
+        .join(profile_segments_infringement_risk_level)
         .rename(columns={"gear_onboard": gear_onboard_column})
         .reset_index()
     )
@@ -130,6 +157,8 @@ def compute_profile_segments_impact_and_priority(
             impact_risk_factor_column,
             segment_highest_priority_column,
             control_priority_level_column,
+            segment_highest_infringement_risk_column,
+            infringement_risk_level_column,
         ]
     ]
     res[segments_column] = res[segments_column].map(lambda d: list(d.keys()))
@@ -174,18 +203,24 @@ def merge(
             cs.control_priority_level,
             cs.segment_highest_impact,
             cs.segment_highest_priority,
+            cs.infringement_risk_level,
+            cs.segment_highest_infringement_risk,
             rs.recent_gear_onboard,
             rs.recent_segments,
             rs.recent_segment_highest_impact,
             rs.recent_segments_impact_risk_factor,
             rs.recent_segment_highest_priority,
             rs.recent_segments_control_priority_level,
+            rs.recent_segments_infringement_risk_level,
+            rs.recent_segment_highest_infringement_risk,
             us.usual_gear_onboard,
             us.usual_segments,
             us.usual_segment_highest_impact,
             us.usual_segments_impact_risk_factor,
             us.usual_segment_highest_priority,
-            us.usual_segments_control_priority_level
+            us.usual_segments_control_priority_level,
+            us.usual_segments_infringement_risk_level,
+            us.usual_segment_highest_infringement_risk
         FROM current_segments cs
         FULL OUTER JOIN usual_segments us
         ON us.cfr = cs.cfr
@@ -235,9 +270,18 @@ def compute_risk_factors(
         pd.Series([[]] * len(risk_factors)),
     )
 
-    risk_factors["probability_risk_factor"] = risk_factors[
-        "infraction_rate_risk_factor"
-    ]
+    risk_factors["probability_risk_factor"] = (
+        risk_factors["infraction_rate_risk_factor"]
+        * risk_factors["infringement_risk_level"]
+    ) ** 0.5
+    risk_factors["recent_segments_probability_risk_factor"] = (
+        risk_factors["infraction_rate_risk_factor"]
+        * risk_factors["recent_segments_infringement_risk_level"]
+    ) ** 0.5
+    risk_factors["usual_segments_probability_risk_factor"] = (
+        risk_factors["infraction_rate_risk_factor"]
+        * risk_factors["usual_segments_infringement_risk_level"]
+    ) ** 0.5
 
     risk_factors["detectability_risk_factor"] = (
         risk_factors["control_rate_risk_factor"]
@@ -269,7 +313,7 @@ def compute_risk_factors(
             ** risk_factor_coefficients["impact"]
         )
         * (
-            risk_factors["probability_risk_factor"]
+            risk_factors["recent_segments_probability_risk_factor"]
             ** risk_factor_coefficients["probability"]
         )
         * (
@@ -283,7 +327,7 @@ def compute_risk_factors(
             ** risk_factor_coefficients["impact"]
         )
         * (
-            risk_factors["probability_risk_factor"]
+            risk_factors["usual_segments_probability_risk_factor"]
             ** risk_factor_coefficients["probability"]
         )
         * (
@@ -341,7 +385,9 @@ def load_risk_factors(risk_factors: pd.DataFrame):
 def risk_factors_flow():
     # Extract
     current_year = get_current_year()
-    control_priorities = extract_control_priorities.submit()
+    control_priorities_and_infringement_risk_levels = (
+        extract_control_priorities_and_infringement_risk_levels.submit()
+    )
     segments = extract_segments_of_year.submit(current_year)
     current_segments = extract_current_segments.submit()
     recent_segments = extract_recent_segments.submit()
@@ -352,11 +398,17 @@ def risk_factors_flow():
     )
 
     # Transform
-    recent_segments = compute_profile_segments_impact_and_priority(
-        recent_segments, segments, control_priorities, VesselProfileType.RECENT
+    recent_segments = compute_profile_segments_risk_levels(
+        recent_segments,
+        segments,
+        control_priorities_and_infringement_risk_levels,
+        VesselProfileType.RECENT,
     )
-    usual_segments = compute_profile_segments_impact_and_priority(
-        usual_segments, segments, control_priorities, VesselProfileType.USUAL
+    usual_segments = compute_profile_segments_risk_levels(
+        usual_segments,
+        segments,
+        control_priorities_and_infringement_risk_levels,
+        VesselProfileType.USUAL,
     )
     merged_segments = merge(current_segments, recent_segments, usual_segments)
     risk_factors = compute_risk_factors(
diff --git a/pipeline/src/queries/monitorfish/control_priorities.sql b/pipeline/src/queries/monitorfish/control_priorities_and_infringement_risk_levels.sql
similarity index 56%
rename from pipeline/src/queries/monitorfish/control_priorities.sql
rename to pipeline/src/queries/monitorfish/control_priorities_and_infringement_risk_levels.sql
index 0fff3695d9..d48b62832a 100644
--- a/pipeline/src/queries/monitorfish/control_priorities.sql
+++ b/pipeline/src/queries/monitorfish/control_priorities_and_infringement_risk_levels.sql
@@ -1,6 +1,7 @@
 SELECT
     facade,
     segment,
-    control_priority_level
+    control_priority_level,
+    infringement_risk_level
 FROM control_objectives
 WHERE year = :year
\ No newline at end of file
diff --git a/pipeline/src/queries/monitorfish/current_segments.sql b/pipeline/src/queries/monitorfish/current_segments.sql
index 4d70261987..ce2361a8f4 100644
--- a/pipeline/src/queries/monitorfish/current_segments.sql
+++ b/pipeline/src/queries/monitorfish/current_segments.sql
@@ -13,5 +13,7 @@ SELECT
     impact_risk_factor,
     control_priority_level,
     segment_highest_impact,
-    segment_highest_priority
+    segment_highest_priority,
+    infringement_risk_level,
+    segment_highest_infringement_risk
 FROM public.current_segments
\ No newline at end of file
diff --git a/pipeline/src/queries/monitorfish/all_control_priorities.sql b/pipeline/src/queries/monitorfish/infringement_risk_levels.sql
similarity index 74%
rename from pipeline/src/queries/monitorfish/all_control_priorities.sql
rename to pipeline/src/queries/monitorfish/infringement_risk_levels.sql
index ef18f4d19d..548683d0a2 100644
--- a/pipeline/src/queries/monitorfish/all_control_priorities.sql
+++ b/pipeline/src/queries/monitorfish/infringement_risk_levels.sql
@@ -2,6 +2,6 @@ SELECT
     year,
     facade,
     segment,
-    control_priority_level
+    infringement_risk_level
 FROM control_objectives
 ORDER BY 1, 2, 3
\ No newline at end of file
diff --git a/pipeline/src/shared_tasks/segments.py b/pipeline/src/shared_tasks/segments.py
index 088ddb05b8..588b236f38 100644
--- a/pipeline/src/shared_tasks/segments.py
+++ b/pipeline/src/shared_tasks/segments.py
@@ -24,9 +24,9 @@ def extract_all_segments():
 
 
 @task
-def extract_control_priorities() -> pd.DataFrame:
+def extract_control_priorities_and_infringement_risk_levels() -> pd.DataFrame:
     return extract(
         db_name="monitorfish_remote",
-        query_filepath="monitorfish/control_priorities.sql",
+        query_filepath="monitorfish/control_priorities_and_infringement_risk_levels.sql",
         params={"year": datetime.utcnow().year},
     )
diff --git a/pipeline/tests/test_data/remote_database/V666.13__Reset_test_control_objectives.sql b/pipeline/tests/test_data/remote_database/V666.13__Reset_test_control_objectives.sql
index 50c73e78f3..86d5e0bbf7 100644
--- a/pipeline/tests/test_data/remote_database/V666.13__Reset_test_control_objectives.sql
+++ b/pipeline/tests/test_data/remote_database/V666.13__Reset_test_control_objectives.sql
@@ -1,7 +1,8 @@
 DELETE FROM public.control_objectives;
 
-INSERT INTO public.control_objectives (facade, segment, year, target_number_of_controls_at_sea, target_number_of_controls_at_port, control_priority_level, id) VALUES 
-('SA', 'SWW01/02/03', EXTRACT(year FROM CURRENT_TIMESTAMP) - 1, 159, 63, 2, 153),
-('SA', 'SWW04', EXTRACT(year FROM CURRENT_TIMESTAMP) - 1, 3, 0, 2, 154),
-('SA', 'SWW01/02/03', EXTRACT(year FROM CURRENT_TIMESTAMP), 139, 43, 1, 155),
-('SA', 'SWW04', EXTRACT(year FROM CURRENT_TIMESTAMP), 23, 10, 3, 156);
+INSERT INTO public.control_objectives (
+    facade,       segment,                                     year, target_number_of_controls_at_sea, target_number_of_controls_at_port, control_priority_level, infringement_risk_level,  id) VALUES 
+(     'SA', 'SWW01/02/03', EXTRACT(year FROM CURRENT_TIMESTAMP) - 1,                              159,                                63,                      2,                       2, 153),
+(     'SA',       'SWW04', EXTRACT(year FROM CURRENT_TIMESTAMP) - 1,                                3,                                 0,                      2,                       2, 154),
+(     'SA', 'SWW01/02/03',     EXTRACT(year FROM CURRENT_TIMESTAMP),                              139,                                43,                      1,                       1, 155),
+(     'SA',       'SWW04',     EXTRACT(year FROM CURRENT_TIMESTAMP),                               23,                                10,                      3,                       4, 156);
diff --git a/pipeline/tests/test_data/remote_database/V666.43__Reset_test_vessel_profiles.sql b/pipeline/tests/test_data/remote_database/V666.43__Reset_test_vessel_profiles.sql
index e426a723fa..ce16da1d96 100644
--- a/pipeline/tests/test_data/remote_database/V666.43__Reset_test_vessel_profiles.sql
+++ b/pipeline/tests/test_data/remote_database/V666.43__Reset_test_vessel_profiles.sql
@@ -1,15 +1,15 @@
 DELETE FROM vessel_profiles;
 
 INSERT INTO vessel_profiles (
-                cfr,                                      gears,                                                                                       species,                                                                                         fao_areas,                                                   segments,                                  landing_ports,               recent_gears,                                              recent_gear_onboard,                                                                                            recent_species,                   recent_fao_areas,        recent_segments, recent_landing_ports, latest_landing_port, latest_landing_facade
+                cfr,                                      gears,                                                                                    gear_onboard,                                                                                       species,                                                                                         fao_areas,                                                   segments,                                  landing_ports,               recent_gears,                                              recent_gear_onboard,                                                                                            recent_species,                   recent_fao_areas,        recent_segments, recent_landing_ports, latest_landing_port, latest_landing_facade
 ) VALUES
-    ('ABC000145907',                             '{"PS1": 1.0}',                                        '{"ANE": 0.03, "MAC": 0.02, "MGU": 0.01, "PIL": 0.94}',                                                                '{"27.7.e": 0.43, "27.8.a": 0.57}',                                           '{"SWW04": 1.0}',                                         'null',             '{"PS1": 1.0}',                                '[{"gear": "PS1", "mesh": 80.0}]',                                                                                            '{"PIL": 1.0}', '{"27.7.e": 0.32, "27.8.a": 0.68}',       '{"SWW04": 1.0}',               'null',                NULL,         'Hors façade'),
-    ('ABC000542519',               '{"DRB": 0.88, "OTB": 0.12}',                                                                  '{"SCE": 0.88, "SCR": 0.12}',                                                                                 '{"27.7.e": 1.0}',                                           '{"SWW04": 1.0}',                               '{"FRQUY": 1.0}',             '{"OTB": 1.0}',                                '[{"gear": "OTB", "mesh": 80.0}]',                                '{"CTC": 0.1, "PLE": 0.1, "SCL": 0.3, "SCR": 0.3, "SOL": 0.1, "TUR": 0.1}',                  '{"27.7.e": 1.0}',       '{"SWW04": 1.0}',     '{"FRQUY": 1.0}',             'FRQUY',                'NAMO'),
-    ('ABC000110255','{"DRB": 0.95, "OTB": 0.026, "OTM": 0.024}',                                                                  '{"MAC": 0.05, "SCE": 0.95}',                                                                                 '{"27.7.e": 1.0}',                      '{"SWW04": 0.95, "NO_SEGMENT": 0.05}',                               '{"FRSQ2": 1.0}',                     'null',                                                           'null',                                                                                                    'null',                             'null',                 'null',               'null',             'FRSQ2',                'NAMO'),
-    ('___TARGET___',  '{"GNS": 0.21, "GTR": 0.67, "LTL": 0.12}',                                '{"ALB": 0.3, "BSS": 0.3, "HKE": 0.1, "TRI": 0.1, "UCA": 0.2}',                                                                                 '{"27.8.b": 1.0}', '{"SWW01/02/03": 0.32, "NO_SEGMENT": 0.27, "SWW04": 0.41}',                               '{"FRCBT": 1.0}',                     'null',                                                           'null',                                                                                                    'null',                             'null',                 'null',               'null',             'FRCBT',                'MEMN'),
-    ('DEF000115851',               '{"DRB": 0.88, "OTB": 0.12}',                                                                  '{"SCE": 0.88, "SCR": 0.12}',                                                                                 '{"27.7.e": 1.0}',                           '{"SWW04": 0.88, "SWW04": 0.12}',                               '{"FRQUY": 1.0}',             '{"OTB": 1.0}',                                '[{"gear": "OTB", "mesh": 80.0}]', '{"BLL": 0.03, "CTC": 0.11, "MNZ": 0.03, "PLE": 0.1, "SCL": 0.28, "SCR": 0.28, "SOL": 0.09, "TUR": 0.08}',                  '{"27.7.e": 1.0}',       '{"SWW04": 1.0}',     '{"FRQUY": 1.0}',             'FRQUY',                'NAMO'),
-    ('DEF000155891','{"FPO": 0.88, "GNS": 0.003, "GTR": 0.117}',                                                                    '{"NSQ": 0.3, "OCT": 0.7}',                                                                                 '{"37.1.2": 1.0}', '{"SWW04": 0.04, "SWW01/02/03": 0.88, "NO_SEGMENT": 0.08}',                               '{"FRVP8": 1.0}', '{"FPO": 0.8, "GTR": 0.2}', '[{"gear": "FPO", "mesh": 80.0}, {"gear": "GTR", "mesh": 80.0}]',                                                                  '{"BOY": 0.58, "OCT": 0.3, "SBG": 0.12}',                  '{"37.1.2": 1.0}', '{"SWW01/02/03": 1.0}',     '{"FRVP8": 1.0}',             'FRVP8',                'NAMO'),
-    ('DEF000542852',                                     'null',                                                                                        'null',                                                                                            'null',                                                     'null',                               '{"FRBOL": 1.0}',                     'null',                                                           'null',                                                                                                    'null',                             'null',                 'null',               'null',             'FRBOL',                'MEMN'),
-    ('DEF000542162',                                     'null',                                                                                        'null',                                                                                            'null',                                                     'null', '{"FRBOL": 0.94, "FRCER": 0.05, "FRROS": 0.0}',                     'null',                                                           'null',                                                                                                    'null',                             'null',                 'null',               'null',             'FRBOL',                'MEMN'),
-    ('GHI010334970',                             '{"TBB": 1.0}',              '{"BSS": 0.01, "COD": 0.01, "CTC": 0.22, "PLE": 0.05, "SCE": 0.05, "SOL": 0.66}', '{"27.7.a": 0.04, "27.7.d": 0.34, "27.7.e": 0.21, "27.7.f": 0.15, "27.7.g": 0.16, "27.7.h": 0.1}',                     '{"SWW01/02/03": 0.01, "SWW04": 0.99}',               '{"FRLEH": 0.52, "FRROS": 0.48}',                     'null',                                                           'null',                                                                                                    'null',                             'null',                 'null',     '{"FRROS": 1.0}',             'FRROS',                'NAMO'),
-    ('GHI010514980',                             '{"TBB": 1.0}', '{"BSS": 0.01, "COD": 0.01, "CTC": 0.22, "PLE": 0.05, "SCE": 0.05, "SOL": 0.65, "WIT": 0.01}',                                  '{"27.4.c": 0.06, "27.7.d": 0.54, "27.7.f": 0.2, "27.7.g": 0.2}',                     '{"SWW01/02/03": 0.03, "SWW04": 0.97}',               '{"FRLEH": 0.57, "FRROS": 0.43}',                     'null',                                                           'null',                                                                                                    'null',                             'null',                 'null',               'null',             'FRROS',                'NAMO');
+    ('ABC000145907',                             '{"PS1": 1.0}',                                                               '[{"gear": "PS1", "mesh": 80.0}]',                                        '{"ANE": 0.03, "MAC": 0.02, "MGU": 0.01, "PIL": 0.94}',                                                                '{"27.7.e": 0.43, "27.8.a": 0.57}',                                           '{"SWW04": 1.0}',                                         'null',             '{"PS1": 1.0}',                                '[{"gear": "PS1", "mesh": 80.0}]',                                                                                            '{"PIL": 1.0}', '{"27.7.e": 0.32, "27.8.a": 0.68}',       '{"SWW04": 1.0}',               'null',                NULL,         'Hors façade'),
+    ('ABC000542519',               '{"DRB": 0.88, "OTB": 0.12}',                                '[{"gear": "DRB", "mesh": null}, {"gear": "OTB", "mesh": 80.0}]',                                                                  '{"SCE": 0.88, "SCR": 0.12}',                                                                                 '{"27.7.e": 1.0}',                                           '{"SWW04": 1.0}',                               '{"FRQUY": 1.0}',             '{"OTB": 1.0}',                                '[{"gear": "OTB", "mesh": 80.0}]',                                '{"CTC": 0.1, "PLE": 0.1, "SCL": 0.3, "SCR": 0.3, "SOL": 0.1, "TUR": 0.1}',                  '{"27.7.e": 1.0}',       '{"SWW04": 1.0}',     '{"FRQUY": 1.0}',             'FRQUY',                'NAMO'),
+    ('ABC000110255','{"DRB": 0.95, "OTB": 0.026, "OTM": 0.024}', '[{"gear": "DRB", "mesh": null}, {"gear": "OTB", "mesh": 80.0}, {"gear": "OTM", "mesh": 80.0}]',                                                                  '{"MAC": 0.05, "SCE": 0.95}',                                                                                 '{"27.7.e": 1.0}',                      '{"SWW04": 0.95, "NO_SEGMENT": 0.05}',                               '{"FRSQ2": 1.0}',                     'null',                                                           'null',                                                                                                    'null',                             'null',                 'null',               'null',             'FRSQ2',                'NAMO'),
+    ('___TARGET___',  '{"GNS": 0.21, "GTR": 0.67, "LTL": 0.12}', '[{"gear": "GNS", "mesh": null}, {"gear": "GTR", "mesh": null}, {"gear": "LTL", "mesh": null}]',                                '{"ALB": 0.3, "BSS": 0.3, "HKE": 0.1, "TRI": 0.1, "UCA": 0.2}',                                                                                 '{"27.8.b": 1.0}', '{"SWW01/02/03": 0.32, "NO_SEGMENT": 0.27, "SWW04": 0.41}',                               '{"FRCBT": 1.0}',                     'null',                                                           'null',                                                                                                    'null',                             'null',                 'null',               'null',             'FRCBT',                'MEMN'),
+    ('DEF000115851',               '{"DRB": 0.88, "OTB": 0.12}',                                '[{"gear": "DRB", "mesh": null}, {"gear": "OTB", "mesh": 80.0}]',                                                                  '{"SCE": 0.88, "SCR": 0.12}',                                                                                 '{"27.7.e": 1.0}',                           '{"SWW04": 0.88, "SWW04": 0.12}',                               '{"FRQUY": 1.0}',             '{"OTB": 1.0}',                                '[{"gear": "OTB", "mesh": 80.0}]', '{"BLL": 0.03, "CTC": 0.11, "MNZ": 0.03, "PLE": 0.1, "SCL": 0.28, "SCR": 0.28, "SOL": 0.09, "TUR": 0.08}',                  '{"27.7.e": 1.0}',       '{"SWW04": 1.0}',     '{"FRQUY": 1.0}',             'FRQUY',                  'SA'),
+    ('DEF000155891','{"FPO": 0.88, "GNS": 0.003, "GTR": 0.117}', '[{"gear": "FPO", "mesh": 80.0}, {"gear": "GNS", "mesh": 80.0}, {"gear": "GTR", "mesh": 80.0}]',                                                                    '{"NSQ": 0.3, "OCT": 0.7}',                                                                                 '{"37.1.2": 1.0}', '{"SWW04": 0.04, "SWW01/02/03": 0.88, "NO_SEGMENT": 0.08}',                               '{"FRVP8": 1.0}', '{"FPO": 0.8, "GTR": 0.2}', '[{"gear": "FPO", "mesh": 80.0}, {"gear": "GTR", "mesh": 80.0}]',                                                                  '{"BOY": 0.58, "OCT": 0.3, "SBG": 0.12}',                  '{"37.1.2": 1.0}', '{"SWW01/02/03": 1.0}',     '{"FRVP8": 1.0}',             'FRVP8',                  'SA'),
+    ('DEF000542852',                                     'null',                                                                                          'null',                                                                                        'null',                                                                                            'null',                                                     'null',                               '{"FRBOL": 1.0}',                     'null',                                                           'null',                                                                                                    'null',                             'null',                 'null',               'null',             'FRBOL',                'MEMN'),
+    ('DEF000542162',                                     'null',                                                                                          'null',                                                                                        'null',                                                                                            'null',                                                     'null', '{"FRBOL": 0.94, "FRCER": 0.05, "FRROS": 0.0}',                     'null',                                                           'null',                                                                                                    'null',                             'null',                 'null',               'null',             'FRBOL',                'MEMN'),
+    ('GHI010334970',                             '{"TBB": 1.0}',                                                               '[{"gear": "TBB", "mesh": null}]',              '{"BSS": 0.01, "COD": 0.01, "CTC": 0.22, "PLE": 0.05, "SCE": 0.05, "SOL": 0.66}', '{"27.7.a": 0.04, "27.7.d": 0.34, "27.7.e": 0.21, "27.7.f": 0.15, "27.7.g": 0.16, "27.7.h": 0.1}',                     '{"SWW01/02/03": 0.01, "SWW04": 0.99}',               '{"FRLEH": 0.52, "FRROS": 0.48}',                     'null',                                                           'null',                                                                                                    'null',                             'null',                 'null',     '{"FRROS": 1.0}',             'FRROS',                'NAMO'),
+    ('GHI010514980',                             '{"TBB": 1.0}',                                                               '[{"gear": "TBB", "mesh": null}]', '{"BSS": 0.01, "COD": 0.01, "CTC": 0.22, "PLE": 0.05, "SCE": 0.05, "SOL": 0.65, "WIT": 0.01}',                                  '{"27.4.c": 0.06, "27.7.d": 0.54, "27.7.f": 0.2, "27.7.g": 0.2}',                     '{"SWW01/02/03": 0.03, "SWW04": 0.97}',               '{"FRLEH": 0.57, "FRROS": 0.43}',                     'null',                                                           'null',                                                                                                    'null',                             'null',                 'null',               'null',             'FRROS',                'NAMO');
diff --git a/pipeline/tests/test_flows/conftest.py b/pipeline/tests/test_flows/conftest.py
index 5313816463..3269cb2ec7 100644
--- a/pipeline/tests/test_flows/conftest.py
+++ b/pipeline/tests/test_flows/conftest.py
@@ -159,11 +159,12 @@ def add_landings(add_monitorfish_database):
 
 
 @fixture
-def control_priorities() -> pd.DataFrame:
+def control_priorities_and_infringement_risk_levels() -> pd.DataFrame:
     return pd.DataFrame(
         {
             "facade": ["Facade 1", "Facade 1", "Facade 2", "Facade 2"],
             "segment": ["T8-9", "L", "T8-9", "L"],
             "control_priority_level": [2.5, 2.8, 2.9, 2.4],
+            "infringement_risk_level": [3.4, 2.1, 3.0, 3.4],
         }
     )
diff --git a/pipeline/tests/test_flows/test_current_segments.py b/pipeline/tests/test_flows/test_current_segments.py
index 750111e271..a46ce38297 100644
--- a/pipeline/tests/test_flows/test_current_segments.py
+++ b/pipeline/tests/test_flows/test_current_segments.py
@@ -332,6 +332,15 @@ def expected_current_segments() -> pd.DataFrame:
             "impact_risk_factor": [2.2, 2.3, 3.3, 2.2, 2.2, 1.0],
             "segment_highest_priority": ["L", None, None, "T8-9", None, None],
             "control_priority_level": [2.8, 1.0, 1.0, 2.9, 1.0, 1.0],
+            "segment_highest_infringement_risk": [
+                "T8-9",
+                None,
+                None,
+                "T8-9",
+                None,
+                None,
+            ],
+            "infringement_risk_level": [3.4, 2.0, 2.0, 3.0, 2.0, 2.0],
         }
     )
 
@@ -409,6 +418,8 @@ def current_segments() -> pd.DataFrame:
             "vessel_id": [None, 1.0, 2.0, None, 7.0],
             "external_immatriculation": [None, "RV348407", "RO237719", None, None],
             "ircs": [None, "LLUK", "FQ7058", None, None],
+            "infringement_risk_level": [2.0, 2.0, 2.0, 2.0, 2.0],
+            "segment_highest_infringement_risk": [None, None, None, None, None],
         }
     )
 
@@ -444,11 +455,14 @@ def test_compute_current_segments(
     current_catches,
     segments_of_year,
     last_positions,
-    control_priorities,
+    control_priorities_and_infringement_risk_levels,
     expected_current_segments,
 ):
     res = compute_current_segments(
-        current_catches, segments_of_year, last_positions, control_priorities
+        current_catches,
+        segments_of_year,
+        last_positions,
+        control_priorities_and_infringement_risk_levels,
     )
     pd.testing.assert_frame_equal(res, expected_current_segments)
 
diff --git a/pipeline/tests/test_flows/test_enrich_logbook.py b/pipeline/tests/test_flows/test_enrich_logbook.py
index 38e6a481ae..1a2237c451 100644
--- a/pipeline/tests/test_flows/test_enrich_logbook.py
+++ b/pipeline/tests/test_flows/test_enrich_logbook.py
@@ -13,8 +13,8 @@
     compute_pno_segments,
     compute_pno_types,
     enrich_logbook_flow,
-    extract_all_control_priorities,
     extract_control_anteriority,
+    extract_infringement_risk_levels,
     extract_pno_catches,
     extract_pno_trips_period,
     extract_pno_types,
@@ -51,7 +51,7 @@ def sample_control_anteriority() -> pd.DataFrame:
 
 
 @pytest.fixture
-def expected_all_control_priorities() -> pd.DataFrame:
+def expected_infringement_risk_levels() -> pd.DataFrame:
     current_year = datetime.utcnow().year
 
     return pd.DataFrame(
@@ -59,7 +59,7 @@ def expected_all_control_priorities() -> pd.DataFrame:
             "year": [current_year - 1, current_year - 1, current_year, current_year],
             "facade": ["SA", "SA", "SA", "SA"],
             "segment": ["SWW01/02/03", "SWW04", "SWW01/02/03", "SWW04"],
-            "control_priority_level": [2.0, 2.0, 1.0, 3.0],
+            "infringement_risk_level": [2.0, 2.0, 1.0, 4.0],
         }
     )
 
@@ -281,7 +281,7 @@ def sample_pno_catches() -> pd.DataFrame:
 
 
 @pytest.fixture
-def sample_all_control_priorities() -> pd.DataFrame:
+def sample_infringement_risk_levels() -> pd.DataFrame:
     return pd.DataFrame(
         {
             "year": [2023, 2023, 2023, 2023, 2023, 2022, 2022],
@@ -295,7 +295,7 @@ def sample_all_control_priorities() -> pd.DataFrame:
                 "SxTB8910",
                 "SHKE27",
             ],
-            "control_priority_level": [2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6],
+            "infringement_risk_level": [2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6],
         }
     )
 
@@ -518,15 +518,15 @@ def expected_computed_pno_segments() -> pd.DataFrame:
                 2.5,
                 1.9,
             ],
-            "control_priority_level": [
-                default_risk_factors["control_priority_level"],
-                default_risk_factors["control_priority_level"],
-                default_risk_factors["control_priority_level"],
+            "infringement_risk_level": [
+                default_risk_factors["infringement_risk_level"],
+                default_risk_factors["infringement_risk_level"],
+                default_risk_factors["infringement_risk_level"],
                 2.3,
-                default_risk_factors["control_priority_level"],
+                default_risk_factors["infringement_risk_level"],
                 2.0,
                 2.4,
-                default_risk_factors["control_priority_level"],
+                default_risk_factors["infringement_risk_level"],
             ],
         }
     )
@@ -831,15 +831,15 @@ def merged_pnos() -> pd.DataFrame:
                 2.5,
                 1.9,
             ],
-            "control_priority_level": [
-                default_risk_factors["control_priority_level"],
-                default_risk_factors["control_priority_level"],
-                default_risk_factors["control_priority_level"],
+            "infringement_risk_level": [
+                default_risk_factors["infringement_risk_level"],
+                default_risk_factors["infringement_risk_level"],
+                default_risk_factors["infringement_risk_level"],
                 2.3,
-                default_risk_factors["control_priority_level"],
+                default_risk_factors["infringement_risk_level"],
                 2.0,
                 2.4,
-                default_risk_factors["control_priority_level"],
+                default_risk_factors["infringement_risk_level"],
             ],
         }
     )
@@ -848,17 +848,17 @@ def merged_pnos() -> pd.DataFrame:
 @pytest.fixture
 def pnos_with_risk_factors(merged_pnos) -> pd.DataFrame:
     return merged_pnos.drop(
-        columns=["impact_risk_factor", "control_priority_level"]
+        columns=["impact_risk_factor", "infringement_risk_level"]
     ).assign(
         risk_factor=[
-            1.15016332,
-            1.74110113,
-            1.74110113,
-            1.98943874,
-            2.09127911,
-            2.87303211,
-            1.71949265,
-            1.97958756,
+            1.46782244,
+            2.46228882,
+            2.46228882,
+            2.30166857,
+            2.95751527,
+            3.21502451,
+            1.81191872,
+            2.79955958,
         ]
     )
 
@@ -866,26 +866,26 @@ def pnos_with_risk_factors(merged_pnos) -> pd.DataFrame:
 @pytest.fixture
 def flagged_pnos(pnos_with_risk_factors) -> pd.DataFrame:
     return pnos_with_risk_factors.assign(
-        is_in_verification_scope=[False, False, True, False, False, True, False, False],
+        is_in_verification_scope=[False, True, True, True, True, True, False, True],
         is_verified=[False, False, False, False, False, False, False, False],
         is_sent=[False, False, False, False, False, False, False, False],
-        is_being_sent=[False, False, False, False, True, False, True, True],
+        is_being_sent=[False, False, False, False, False, False, True, False],
     )
 
 
 @pytest.fixture
 def flagged_pnos_with_active_reportings(flagged_pnos) -> pd.DataFrame:
     return flagged_pnos.assign(
-        is_in_verification_scope=[True, False, True, False, False, True, True, False],
-        is_being_sent=[False, False, False, False, True, False, False, True],
+        is_in_verification_scope=[True, True, True, True, True, True, True, True],
+        is_being_sent=[False, False, False, False, False, False, False, False],
     )
 
 
-def test_extract_all_control_priorities(
-    reset_test_data, expected_all_control_priorities
+def test_extract_infringement_risk_levels(
+    reset_test_data, expected_infringement_risk_levels
 ):
-    res = extract_all_control_priorities()
-    pd.testing.assert_frame_equal(res, expected_all_control_priorities)
+    res = extract_infringement_risk_levels()
+    pd.testing.assert_frame_equal(res, expected_infringement_risk_levels)
 
 
 def test_extract_pno_types(reset_test_data, expected_pno_types):
@@ -961,11 +961,11 @@ def test_compute_pno_types_with_empty_gears_list_only(
 def test_compute_pno_segments(
     sample_pno_catches,
     segments,
-    sample_all_control_priorities,
+    sample_infringement_risk_levels,
     expected_computed_pno_segments,
 ):
     res = compute_pno_segments(
-        sample_pno_catches, segments, sample_all_control_priorities
+        sample_pno_catches, segments, sample_infringement_risk_levels
     )
     pd.testing.assert_frame_equal(res, expected_computed_pno_segments)
 
@@ -973,12 +973,12 @@ def test_compute_pno_segments(
 def test_compute_pno_segments_with_empty_gears_only(
     sample_pno_catches,
     segments,
-    sample_all_control_priorities,
+    sample_infringement_risk_levels,
     expected_computed_pno_segments,
 ):
     assert sample_pno_catches.loc[2, "trip_gears"] == []
     res = compute_pno_segments(
-        sample_pno_catches.loc[[2]], segments, sample_all_control_priorities
+        sample_pno_catches.loc[[2]], segments, sample_infringement_risk_levels
     )
     pd.testing.assert_frame_equal(
         res, expected_computed_pno_segments.loc[[2]].reset_index(drop=True)
diff --git a/pipeline/tests/test_flows/test_risk_factors.py b/pipeline/tests/test_flows/test_risk_factors.py
index e0e46645d5..6dae3c2752 100644
--- a/pipeline/tests/test_flows/test_risk_factors.py
+++ b/pipeline/tests/test_flows/test_risk_factors.py
@@ -5,7 +5,7 @@
 from src.db_config import create_engine
 from src.entities.vessel_profiles import VesselProfileType
 from src.flows.risk_factors import (
-    compute_profile_segments_impact_and_priority,
+    compute_profile_segments_risk_levels,
     extract_recent_segments,
     risk_factors_flow,
 )
@@ -18,38 +18,51 @@ def risk_factors() -> pd.DataFrame:
         {
             "cfr": [
                 "ABC000055481",
+                "ABC000110255",
                 "ABC000145907",
                 "ABC000306959",
                 "ABC000542519",
                 "CFR_OF_LOGBK",
                 "DEF000115851",
                 "DEF000155891",
+                "GHI010334970",
+                "GHI010514980",
                 "OLD_VESSEL_1",
+                "___TARGET___",
                 "UNKONWN_VESS",
             ],
             "ircs": [
                 "IL2468",
                 None,
+                None,
                 "LLUK",
                 "FQ7058",
                 "OLY7853",
                 None,
                 None,
+                None,
+                None,
                 "SOMEID",
+                "TGT",
                 None,
             ],
             "external_immatriculation": [
                 "AS761555",
                 None,
+                None,
                 "RV348407",
                 "RO237719",
                 "SB125334",
                 None,
                 None,
+                None,
+                None,
                 "HG987654",
+                "PNO_TARGET",
                 None,
             ],
             "last_logbook_message_datetime_utc": [
+                pd.NaT,
                 pd.NaT,
                 pd.NaT,
                 pd.Timestamp("2022-04-06 03:13:10"),
@@ -57,10 +70,14 @@ def risk_factors() -> pd.DataFrame:
                 pd.Timestamp("2022-02-06 03:13:10"),
                 pd.NaT,
                 pd.NaT,
+                pd.NaT,
+                pd.NaT,
                 pd.Timestamp("2020-02-01 05:59:06"),
+                pd.NaT,
                 pd.Timestamp("2022-03-20 01:18:19"),
             ],
             "departure_datetime_utc": [
+                pd.NaT,
                 pd.NaT,
                 pd.NaT,
                 pd.Timestamp("2018-02-27 01:05:00"),
@@ -68,10 +85,14 @@ def risk_factors() -> pd.DataFrame:
                 pd.Timestamp("2018-02-01 01:05:00"),
                 pd.NaT,
                 pd.NaT,
+                pd.NaT,
+                pd.NaT,
                 pd.Timestamp("2020-02-01 01:05:00"),
+                pd.NaT,
                 pd.Timestamp("2022-03-18 05:23:10"),
             ],
             "trip_number": [
+                None,
                 None,
                 None,
                 "20210001",
@@ -79,10 +100,14 @@ def risk_factors() -> pd.DataFrame:
                 "20220004",
                 None,
                 None,
+                None,
+                None,
                 "20200006",
+                None,
                 "20220027",
             ],
             "gear_onboard": [
+                None,
                 None,
                 None,
                 [{"gear": "OTM", "mesh": 80.0}],
@@ -90,10 +115,14 @@ def risk_factors() -> pd.DataFrame:
                 [{"gear": "OTM", "mesh": 80.0}],
                 None,
                 None,
+                None,
+                None,
                 [{"gear": "PTB", "mesh": 65.0}],
+                None,
                 [{"gear": "OTM", "mesh": 100.0}],
             ],
             "species_onboard": [
+                None,
                 None,
                 None,
                 [
@@ -128,6 +157,8 @@ def risk_factors() -> pd.DataFrame:
                 ],
                 None,
                 None,
+                None,
+                None,
                 [
                     {
                         "gear": "PTB",
@@ -136,6 +167,7 @@ def risk_factors() -> pd.DataFrame:
                         "species": "ANE",
                     }
                 ],
+                None,
                 [
                     {
                         "gear": "OTM",
@@ -145,8 +177,23 @@ def risk_factors() -> pd.DataFrame:
                     }
                 ],
             ],
-            "segments": [[], [], ["SWW04"], ["SWW01/02/03"], ["SWW04"], [], [], [], []],
+            "segments": [
+                [],
+                [],
+                [],
+                ["SWW04"],
+                ["SWW01/02/03"],
+                ["SWW04"],
+                [],
+                [],
+                [],
+                [],
+                [],
+                [],
+                [],
+            ],
             "total_weight_onboard": [
+                None,
                 None,
                 None,
                 713.0,
@@ -154,95 +201,183 @@ def risk_factors() -> pd.DataFrame:
                 713.0,
                 None,
                 None,
+                None,
+                None,
                 213.0,
+                None,
                 57.0,
             ],
             "last_control_datetime_utc": [
                 pd.Timestamp("2018-01-08 08:57:45"),
                 pd.NaT,
+                pd.NaT,
                 pd.Timestamp("2020-06-08 19:21:40"),
                 pd.NaT,
                 pd.Timestamp("2017-01-08 08:57:45"),
                 pd.NaT,
                 pd.NaT,
+                pd.NaT,
+                pd.NaT,
                 pd.Timestamp("2018-01-01 07:57:45"),
                 pd.NaT,
+                pd.NaT,
             ],
             "last_control_infraction": [
                 False,
                 None,
+                None,
                 True,
                 None,
                 True,
                 None,
                 None,
+                None,
+                None,
                 False,
                 None,
+                None,
             ],
             "post_control_comments": [
                 "RAS",
                 None,
+                None,
                 "OTB 70MM DÉCLARÉ - signaux pyrotechniques périmés",
                 None,
                 "CA PECHE OU BIEN?",
                 None,
                 None,
+                None,
+                None,
                 "RAS",
                 None,
+                None,
+            ],
+            "impact_risk_factor": [
+                1.0,
+                1.0,
+                1.0,
+                2.1,
+                3.0,
+                2.1,
+                1.0,
+                1.0,
+                1.0,
+                1.0,
+                1.0,
+                1.0,
+                1.0,
+            ],
+            "probability_risk_factor": [
+                1.4142135623730951,
+                2.0,
+                2.0,
+                1.0,
+                1.4142135623730951,
+                1.0,
+                2.0,
+                2.0,
+                2.0,
+                2.0,
+                1.0,
+                2.0,
+                1.4142135623730951,
             ],
-            "impact_risk_factor": [1.0, 1.0, 2.1, 3.0, 2.1, 1.0, 1.0, 1.0, 1.0],
-            "probability_risk_factor": [1.0, 2.0, 1.0, 2.0, 1.0, 2.0, 2.0, 1.0, 2.0],
             "detectability_risk_factor": [
-                1.3228756555323,
+                1.3228756555322954,
+                2.0,
+                2.0,
+                1.3228756555322954,
+                2.0,
+                1.3228756555322954,
                 2.0,
-                1.3228756555323,
                 2.0,
-                1.3228756555323,
                 2.0,
                 2.0,
-                1.3228756555323,
+                1.3228756555322954,
+                2.0,
                 2.0,
             ],
             "risk_factor": [
-                1.1501633168956,
-                1.74110112659225,
-                1.3341460388872,
-                2.1689435423954,
-                1.3341460388872,
-                1.74110112659225,
-                1.74110112659225,
-                1.1501633168956,
-                1.74110112659225,
-            ],
-            "control_priority_level": [1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0],
+                1.276186104319656,
+                1.7411011265922485,
+                1.7411011265922485,
+                1.3341460388872017,
+                1.954761370960625,
+                1.3341460388872017,
+                1.7411011265922485,
+                1.7411011265922485,
+                1.7411011265922485,
+                1.7411011265922485,
+                1.1501633168956031,
+                1.7411011265922485,
+                1.5691681957935018,
+            ],
+            "control_priority_level": [
+                1.0,
+                1.0,
+                1.0,
+                1.0,
+                1.0,
+                1.0,
+                1.0,
+                1.0,
+                1.0,
+                1.0,
+                1.0,
+                1.0,
+                1.0,
+            ],
             "control_rate_risk_factor": [
                 1.75,
                 4.0,
+                4.0,
                 1.75,
                 4.0,
                 1.75,
                 4.0,
                 4.0,
+                4.0,
+                4.0,
                 1.75,
                 4.0,
+                4.0,
             ],
             "infraction_rate_risk_factor": [
                 1.0,
                 2.0,
+                2.0,
                 1.0,
                 2.0,
                 1.0,
                 2.0,
                 2.0,
+                2.0,
+                2.0,
                 1.0,
                 2.0,
+                2.0,
             ],
-            "infraction_score": [-5.5, None, -4.5, None, -5.5, None, None, -5.5, None],
-            "number_controls_last_3_years": [11, 0, 5, 0, 11, 0, 0, 11, 0],
-            "number_controls_last_5_years": [11, 0, 6, 0, 11, 0, 0, 11, 0],
-            "number_infractions_last_5_years": [1, 0, 6, 0, 1, 0, 0, 1, 0],
-            "number_recent_controls": [1, 0, 2, 0, 1, 0, 0, 1, 0],
+            "infraction_score": [
+                -5.5,
+                None,
+                None,
+                -4.5,
+                None,
+                -5.5,
+                None,
+                None,
+                None,
+                None,
+                -5.5,
+                None,
+                None,
+            ],
+            "number_controls_last_3_years": [11, 0, 0, 5, 0, 11, 0, 0, 0, 0, 11, 0, 0],
+            "number_controls_last_5_years": [11, 0, 0, 6, 0, 11, 0, 0, 0, 0, 11, 0, 0],
+            "number_infractions_last_5_years": [1, 0, 0, 6, 0, 1, 0, 0, 0, 0, 1, 0, 0],
+            "number_recent_controls": [1, 0, 0, 2, 0, 1, 0, 0, 0, 0, 1, 0, 0],
             "segment_highest_impact": [
+                None,
                 None,
                 None,
                 "SWW04",
@@ -252,6 +387,9 @@ def risk_factors() -> pd.DataFrame:
                 None,
                 None,
                 None,
+                None,
+                None,
+                None,
             ],
             "segment_highest_priority": [
                 None,
@@ -263,12 +401,73 @@ def risk_factors() -> pd.DataFrame:
                 None,
                 None,
                 None,
+                None,
+                None,
+                None,
+                None,
+            ],
+            "vessel_id": [
+                3.0,
+                None,
+                None,
+                1.0,
+                2.0,
+                4.0,
+                None,
+                None,
+                None,
+                None,
+                5.0,
+                7.0,
+                None,
+            ],
+            "number_gear_seizures_last_5_years": [
+                1,
+                0,
+                0,
+                1,
+                0,
+                2,
+                0,
+                0,
+                0,
+                0,
+                1,
+                0,
+                0,
+            ],
+            "number_species_seizures_last_5_years": [
+                3,
+                0,
+                0,
+                1,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                3,
+                0,
+                0,
+            ],
+            "number_vessel_seizures_last_5_years": [
+                0,
+                0,
+                0,
+                1,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
+                0,
             ],
-            "vessel_id": [3.0, None, 1.0, 2.0, 4.0, None, None, 5.0, None],
-            "number_gear_seizures_last_5_years": [1, 0, 1, 0, 2, 0, 0, 1, 0],
-            "number_species_seizures_last_5_years": [3, 0, 1, 0, 0, 0, 0, 3, 0],
-            "number_vessel_seizures_last_5_years": [0, 0, 1, 0, 0, 0, 0, 0, 0],
             "recent_gear_onboard": [
+                None,
                 None,
                 [{"gear": "PS1", "mesh": 80.0}],
                 None,
@@ -278,8 +477,12 @@ def risk_factors() -> pd.DataFrame:
                 [{"gear": "FPO", "mesh": 80.0}, {"gear": "GTR", "mesh": 80.0}],
                 None,
                 None,
+                None,
+                None,
+                None,
             ],
             "recent_segments": [
+                [],
                 [],
                 ["SWW04"],
                 [],
@@ -289,8 +492,12 @@ def risk_factors() -> pd.DataFrame:
                 ["SWW01/02/03"],
                 [],
                 [],
+                [],
+                [],
+                [],
             ],
             "recent_segments_impact_risk_factor": [
+                1.0,
                 1.0,
                 2.1,
                 1.0,
@@ -300,28 +507,39 @@ def risk_factors() -> pd.DataFrame:
                 3.0,
                 1.0,
                 1.0,
+                1.0,
+                1.0,
+                1.0,
             ],
             "recent_segments_detectability_risk_factor": [
-                1.3228756555323,
+                1.3228756555322954,
+                2.0,
                 2.0,
-                1.3228756555323,
+                1.3228756555322954,
                 2.0,
-                1.3228756555323,
+                1.3228756555322954,
+                3.4641016151377544,
                 2.0,
                 2.0,
-                1.3228756555323,
+                2.0,
+                1.3228756555322954,
+                2.0,
                 2.0,
             ],
             "recent_segments_risk_factor": [
-                1.1501633168956,
-                2.01961159534697,
-                1.1501633168956,
-                2.01961159534697,
-                1.1501633168956,
-                2.01961159534697,
-                2.1689435423954,
-                1.1501633168956,
-                1.74110112659225,
+                1.276186104319656,
+                1.7411011265922485,
+                2.0196115953469707,
+                1.276186104319656,
+                2.0196115953469707,
+                1.276186104319656,
+                2.9491894286454396,
+                1.954761370960625,
+                1.7411011265922485,
+                1.7411011265922485,
+                1.276186104319656,
+                1.7411011265922485,
+                1.7411011265922485,
             ],
             "recent_segments_control_priority_level": [
                 1.0,
@@ -330,11 +548,16 @@ def risk_factors() -> pd.DataFrame:
                 1.0,
                 1.0,
                 1.0,
+                3.0,
+                1.0,
+                1.0,
+                1.0,
                 1.0,
                 1.0,
                 1.0,
             ],
             "recent_segment_highest_impact": [
+                None,
                 None,
                 "SWW04",
                 None,
@@ -344,62 +567,111 @@ def risk_factors() -> pd.DataFrame:
                 "SWW01/02/03",
                 None,
                 None,
-            ],
-            "recent_segment_highest_priority": [
                 None,
                 None,
                 None,
+            ],
+            "recent_segment_highest_priority": [
                 None,
                 None,
                 None,
                 None,
                 None,
                 None,
-            ],
-            "usual_gear_onboard": [
+                "SWW04",
+                "SWW01/02/03",
                 None,
                 None,
                 None,
                 None,
                 None,
+            ],
+            "usual_gear_onboard": [
                 None,
+                [
+                    {"gear": "DRB", "mesh": None},
+                    {"gear": "OTB", "mesh": 80.0},
+                    {"gear": "OTM", "mesh": 80.0},
+                ],
+                [{"gear": "PS1", "mesh": 80.0}],
                 None,
+                [{"gear": "DRB", "mesh": None}, {"gear": "OTB", "mesh": 80.0}],
                 None,
+                [{"gear": "DRB", "mesh": None}, {"gear": "OTB", "mesh": 80.0}],
+                [
+                    {"gear": "FPO", "mesh": 80.0},
+                    {"gear": "GNS", "mesh": 80.0},
+                    {"gear": "GTR", "mesh": 80.0},
+                ],
+                [{"gear": "TBB", "mesh": None}],
+                [{"gear": "TBB", "mesh": None}],
                 None,
+                [
+                    {"gear": "GNS", "mesh": None},
+                    {"gear": "GTR", "mesh": None},
+                    {"gear": "LTL", "mesh": None},
+                ],
+                None,
+            ],
+            "usual_segments": [
+                [],
+                ["SWW04"],
+                ["SWW04"],
+                [],
+                ["SWW04"],
+                [],
+                ["SWW04"],
+                ["SWW04", "SWW01/02/03"],
+                ["SWW04", "SWW01/02/03"],
+                ["SWW04", "SWW01/02/03"],
+                [],
+                ["SWW04", "SWW01/02/03"],
+                [],
             ],
-            "usual_segments": [[], [], [], [], [], [], [], [], []],
             "usual_segments_impact_risk_factor": [
                 1.0,
+                2.1,
+                2.1,
                 1.0,
+                2.1,
                 1.0,
+                2.1,
+                3.0,
+                3.0,
+                3.0,
                 1.0,
-                1.0,
-                1.0,
-                1.0,
-                1.0,
+                3.0,
                 1.0,
             ],
             "usual_segments_detectability_risk_factor": [
-                1.3228756555323,
+                1.3228756555322954,
+                2.0,
                 2.0,
-                1.3228756555323,
+                1.3228756555322954,
                 2.0,
-                1.3228756555323,
+                1.3228756555322954,
+                3.4641016151377544,
+                3.4641016151377544,
                 2.0,
                 2.0,
-                1.3228756555323,
+                1.3228756555322954,
+                2.0,
                 2.0,
             ],
             "usual_segments_risk_factor": [
-                1.1501633168956,
-                1.74110112659225,
-                1.1501633168956,
-                1.74110112659225,
-                1.1501633168956,
-                1.74110112659225,
-                1.74110112659225,
-                1.1501633168956,
-                1.74110112659225,
+                1.276186104319656,
+                2.0196115953469707,
+                2.0196115953469707,
+                1.276186104319656,
+                2.0196115953469707,
+                1.276186104319656,
+                2.9491894286454396,
+                3.167255219418738,
+                2.1689435423953976,
+                2.1689435423953976,
+                1.276186104319656,
+                2.1689435423953976,
+                1.7411011265922485,
             ],
             "usual_segments_control_priority_level": [
                 1.0,
@@ -408,19 +680,27 @@ def risk_factors() -> pd.DataFrame:
                 1.0,
                 1.0,
                 1.0,
+                3.0,
+                3.0,
+                1.0,
+                1.0,
                 1.0,
                 1.0,
                 1.0,
             ],
             "usual_segment_highest_impact": [
                 None,
+                "SWW04",
+                "SWW04",
                 None,
+                "SWW04",
                 None,
+                "SWW04",
+                "SWW01/02/03",
+                "SWW01/02/03",
+                "SWW01/02/03",
                 None,
-                None,
-                None,
-                None,
-                None,
+                "SWW01/02/03",
                 None,
             ],
             "usual_segment_highest_priority": [
@@ -430,11 +710,16 @@ def risk_factors() -> pd.DataFrame:
                 None,
                 None,
                 None,
+                "SWW04",
+                "SWW04",
+                None,
+                None,
                 None,
                 None,
                 None,
             ],
             "last_control_at_sea_datetime_utc": [
+                pd.NaT,
                 pd.NaT,
                 pd.NaT,
                 pd.Timestamp("2020-06-08 19:21:40"),
@@ -444,17 +729,24 @@ def risk_factors() -> pd.DataFrame:
                 pd.NaT,
                 pd.NaT,
                 pd.NaT,
+                pd.NaT,
+                pd.NaT,
+                pd.NaT,
             ],
             "last_control_at_quay_datetime_utc": [
                 pd.Timestamp("2018-01-08 08:57:45"),
                 pd.NaT,
                 pd.NaT,
                 pd.NaT,
+                pd.NaT,
                 pd.Timestamp("2016-01-08 08:57:45"),
                 pd.NaT,
                 pd.NaT,
+                pd.NaT,
+                pd.NaT,
                 pd.Timestamp("2018-01-01 07:57:45"),
                 pd.NaT,
+                pd.NaT,
             ],
             "last_control_infractions": [
                 [
@@ -467,6 +759,7 @@ def risk_factors() -> pd.DataFrame:
                 [],
                 [],
                 [],
+                [],
                 [
                     {
                         "natinf": 27724,
@@ -481,8 +774,131 @@ def risk_factors() -> pd.DataFrame:
                 ],
                 [],
                 [],
+                [],
+                [],
                 [{"natinf": 2606}, {"natinf": 4761}, {"natinf": 22206}],
                 [],
+                [],
+            ],
+            "recent_segments_probability_risk_factor": [
+                1.4142135623730951,
+                2.0,
+                2.0,
+                1.4142135623730951,
+                2.0,
+                1.4142135623730951,
+                2.8284271247461903,
+                1.4142135623730951,
+                2.0,
+                2.0,
+                1.4142135623730951,
+                2.0,
+                2.0,
+            ],
+            "usual_segments_probability_risk_factor": [
+                1.4142135623730951,
+                2.0,
+                2.0,
+                1.4142135623730951,
+                2.0,
+                1.4142135623730951,
+                2.8284271247461903,
+                2.8284271247461903,
+                2.0,
+                2.0,
+                1.4142135623730951,
+                2.0,
+                2.0,
+            ],
+            "infringement_risk_level": [
+                2.0,
+                2.0,
+                2.0,
+                1.0,
+                1.0,
+                1.0,
+                2.0,
+                2.0,
+                2.0,
+                2.0,
+                1.0,
+                2.0,
+                1.0,
+            ],
+            "segment_highest_infringement_risk": [
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+            ],
+            "recent_segments_infringement_risk_level": [
+                2.0,
+                2.0,
+                2.0,
+                2.0,
+                2.0,
+                2.0,
+                4.0,
+                1.0,
+                2.0,
+                2.0,
+                2.0,
+                2.0,
+                2.0,
+            ],
+            "recent_segment_highest_infringement_risk": [
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                "SWW04",
+                "SWW01/02/03",
+                None,
+                None,
+                None,
+                None,
+                None,
+            ],
+            "usual_segments_infringement_risk_level": [
+                2.0,
+                2.0,
+                2.0,
+                2.0,
+                2.0,
+                2.0,
+                4.0,
+                4.0,
+                2.0,
+                2.0,
+                2.0,
+                2.0,
+                2.0,
+            ],
+            "usual_segment_highest_infringement_risk": [
+                None,
+                None,
+                None,
+                None,
+                None,
+                None,
+                "SWW04",
+                "SWW04",
+                None,
+                None,
+                None,
+                None,
+                None,
             ],
             "has_current_vms_fishing_activity": [
                 True,
@@ -519,7 +935,7 @@ def expected_recent_segments() -> pd.DataFrame:
                 {"SWW04": 1.0},
                 {"SWW01/02/03": 1.0},
             ],
-            "facade": ["Hors façade", "NAMO", "NAMO", "NAMO"],
+            "facade": ["Hors façade", "NAMO", "SA", "SA"],
         }
     )
 
@@ -589,6 +1005,14 @@ def computed_recent_segments() -> pd.DataFrame:
             "recent_segments_impact_risk_factor": [2.2, 1.9, 2.2, 2.2, None],
             "recent_segment_highest_priority": ["T8-9", "L", None, "L", None],
             "recent_segments_control_priority_level": [2.9, 2.8, None, 2.8, None],
+            "recent_segment_highest_infringement_risk": [
+                "T8-9",
+                "L",
+                None,
+                "T8-9",
+                None,
+            ],
+            "recent_segments_infringement_risk_level": [3.0, 2.1, None, 3.4, None],
         }
     )
 
@@ -600,16 +1024,22 @@ def test_extract_recent_segments(reset_test_data, expected_recent_segments):
     )
 
 
-def test_compute_profile_segments_impact_and_priority(
-    recent_segments, segments_of_year, control_priorities, computed_recent_segments
+def test_compute_profile_segments_risk_levels(
+    recent_segments,
+    segments_of_year,
+    control_priorities_and_infringement_risk_levels,
+    computed_recent_segments,
 ):
-    res = compute_profile_segments_impact_and_priority(
-        recent_segments, segments_of_year, control_priorities, VesselProfileType.RECENT
+    res = compute_profile_segments_risk_levels(
+        recent_segments,
+        segments_of_year,
+        control_priorities_and_infringement_risk_levels,
+        VesselProfileType.RECENT,
     )
     pd.testing.assert_frame_equal(res, computed_recent_segments)
 
 
-def test_risk_factor_flow(reset_test_data, risk_factors):
+def test_risk_factors_flow(reset_test_data, risk_factors):
     query = """SELECT *
     FROM risk_factors
     ORDER BY cfr"""
diff --git a/pipeline/tests/test_shared_tasks/test_segments.py b/pipeline/tests/test_shared_tasks/test_segments.py
new file mode 100644
index 0000000000..5e030ee7f6
--- /dev/null
+++ b/pipeline/tests/test_shared_tasks/test_segments.py
@@ -0,0 +1,32 @@
+import pandas as pd
+from pytest import fixture
+
+from src.shared_tasks.segments import (
+    extract_control_priorities_and_infringement_risk_levels,
+)
+
+
+@fixture
+def expected_control_priorities_and_infringement_risk_levels():
+    return pd.DataFrame(
+        {
+            "facade": ["SA", "SA"],
+            "segment": ["SWW01/02/03", "SWW04"],
+            "control_priority_level": [1.0, 3.0],
+            "infringement_risk_level": [1.0, 4.0],
+        }
+    )
+
+
+def test_extract_control_priorities_and_infringement_risk_levels(
+    reset_test_data, expected_control_priorities_and_infringement_risk_levels
+):
+    control_priorities_and_infringement_risk_levels = (
+        extract_control_priorities_and_infringement_risk_levels()
+    )
+    pd.testing.assert_frame_equal(
+        control_priorities_and_infringement_risk_levels.sort_values(
+            "segment"
+        ).reset_index(drop=True),
+        expected_control_priorities_and_infringement_risk_levels,
+    )