diff --git a/pom.xml b/pom.xml
index 01f93feca..d11cb4286 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
     <groupId>uk.gov.moj.cpp.progression</groupId>
     <artifactId>progression-parent</artifactId>
-    <version>17.0.270-SNAPSHOT</version>
+    <version>17.0.270-PDE-977-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Progression services application</name>
diff --git a/progression-command/pom.xml b/progression-command/pom.xml
index 90c9891fe..6aaf565cc 100644
--- a/progression-command/pom.xml
+++ b/progression-command/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-parent</artifactId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
     <artifactId>progression-command</artifactId>
     <packaging>pom</packaging>
diff --git a/progression-command/progression-command-api/pom.xml b/progression-command/progression-command-api/pom.xml
index 6f63bf5cb..080a6f3c5 100644
--- a/progression-command/progression-command-api/pom.xml
+++ b/progression-command/progression-command-api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-command</artifactId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
     <artifactId>progression-command-api</artifactId>
     <packaging>war</packaging>
diff --git a/progression-command/progression-command-handler/pom.xml b/progression-command/progression-command-handler/pom.xml
index 23c911f4c..ed2197b11 100644
--- a/progression-command/progression-command-handler/pom.xml
+++ b/progression-command/progression-command-handler/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-command</artifactId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
     <artifactId>progression-command-handler</artifactId>
     <packaging>war</packaging>
diff --git a/progression-domain/pom.xml b/progression-domain/pom.xml
index 59ebb4d31..524c0eccf 100644
--- a/progression-domain/pom.xml
+++ b/progression-domain/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>uk.gov.moj.cpp.progression</groupId>
     <artifactId>progression-parent</artifactId>
-    <version>17.0.270-SNAPSHOT</version>
+    <version>17.0.270-PDE-977-SNAPSHOT</version>
   </parent>
   <artifactId>progression-domain</artifactId>
   <packaging>pom</packaging>
diff --git a/progression-domain/progression-datatypes-common/pom.xml b/progression-domain/progression-datatypes-common/pom.xml
index 2e7ed5f59..20cab5dbc 100644
--- a/progression-domain/progression-datatypes-common/pom.xml
+++ b/progression-domain/progression-datatypes-common/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>progression-domain</artifactId>
         <groupId>uk.gov.moj.cpp.progression</groupId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/progression-domain/progression-domain-aggregate/pom.xml b/progression-domain/progression-domain-aggregate/pom.xml
index 3a267564b..cef0bf644 100644
--- a/progression-domain/progression-domain-aggregate/pom.xml
+++ b/progression-domain/progression-domain-aggregate/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>progression-domain</artifactId>
         <groupId>uk.gov.moj.cpp.progression</groupId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>progression-domain-aggregate</artifactId>
diff --git a/progression-domain/progression-domain-common/pom.xml b/progression-domain/progression-domain-common/pom.xml
index 8389bff46..882efaf29 100644
--- a/progression-domain/progression-domain-common/pom.xml
+++ b/progression-domain/progression-domain-common/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-domain</artifactId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
     <artifactId>progression-domain-common</artifactId>
     <dependencies>
diff --git a/progression-domain/progression-domain-message/pom.xml b/progression-domain/progression-domain-message/pom.xml
index a1c8336db..97e6a12bd 100644
--- a/progression-domain/progression-domain-message/pom.xml
+++ b/progression-domain/progression-domain-message/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-domain</artifactId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
     <artifactId>progression-domain-message</artifactId>
     <properties>
diff --git a/progression-event-sources/pom.xml b/progression-event-sources/pom.xml
index 2f86c35c6..6eefe78fd 100644
--- a/progression-event-sources/pom.xml
+++ b/progression-event-sources/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>progression-parent</artifactId>
         <groupId>uk.gov.moj.cpp.progression</groupId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/progression-event/pom.xml b/progression-event/pom.xml
index a0370a91b..c8b389ab9 100644
--- a/progression-event/pom.xml
+++ b/progression-event/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-parent</artifactId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
     <artifactId>progression-event</artifactId>
     <packaging>pom</packaging>
diff --git a/progression-event/progression-event-indexer/pom.xml b/progression-event/progression-event-indexer/pom.xml
index 9ac467468..f7a0fd882 100644
--- a/progression-event/progression-event-indexer/pom.xml
+++ b/progression-event/progression-event-indexer/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-event</artifactId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
     <artifactId>progression-event-indexer</artifactId>
     <packaging>war</packaging>
diff --git a/progression-event/progression-event-listener/pom.xml b/progression-event/progression-event-listener/pom.xml
index aebf03e7a..fe4224845 100644
--- a/progression-event/progression-event-listener/pom.xml
+++ b/progression-event/progression-event-listener/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-event</artifactId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
     <artifactId>progression-event-listener</artifactId>
     <packaging>war</packaging>
diff --git a/progression-event/progression-event-processor/pom.xml b/progression-event/progression-event-processor/pom.xml
index 0667c6496..8d573430b 100644
--- a/progression-event/progression-event-processor/pom.xml
+++ b/progression-event/progression-event-processor/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-event</artifactId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
     <artifactId>progression-event-processor</artifactId>
     <packaging>war</packaging>
diff --git a/progression-eventprocessorstore/pom.xml b/progression-eventprocessorstore/pom.xml
index ae24e7575..75fc47f4d 100644
--- a/progression-eventprocessorstore/pom.xml
+++ b/progression-eventprocessorstore/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>progression-parent</artifactId>
         <groupId>uk.gov.moj.cpp.progression</groupId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>progression-eventprocessorstore</artifactId>
diff --git a/progression-eventprocessorstore/progression-eventprocessorstore-liquibase/pom.xml b/progression-eventprocessorstore/progression-eventprocessorstore-liquibase/pom.xml
index aaa2168d0..e2eb0cce1 100644
--- a/progression-eventprocessorstore/progression-eventprocessorstore-liquibase/pom.xml
+++ b/progression-eventprocessorstore/progression-eventprocessorstore-liquibase/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-eventprocessorstore</artifactId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>progression-eventprocessorstore-liquibase</artifactId>
diff --git a/progression-eventprocessorstore/progression-eventprocessorstore-persistence/pom.xml b/progression-eventprocessorstore/progression-eventprocessorstore-persistence/pom.xml
index 92dabd628..34f50d12a 100644
--- a/progression-eventprocessorstore/progression-eventprocessorstore-persistence/pom.xml
+++ b/progression-eventprocessorstore/progression-eventprocessorstore-persistence/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-eventprocessorstore</artifactId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>progression-eventprocessorstore-persistence</artifactId>
diff --git a/progression-healthchecks/pom.xml b/progression-healthchecks/pom.xml
index b41fb428c..ec4a0f631 100644
--- a/progression-healthchecks/pom.xml
+++ b/progression-healthchecks/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>progression-parent</artifactId>
         <groupId>uk.gov.moj.cpp.progression</groupId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/progression-integration-test/pom.xml b/progression-integration-test/pom.xml
index efed03f68..249f3e913 100644
--- a/progression-integration-test/pom.xml
+++ b/progression-integration-test/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-parent</artifactId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
     <properties>
         <skip.schema.pojo.generation>false</skip.schema.pojo.generation>
diff --git a/progression-performance-test/pom.xml b/progression-performance-test/pom.xml
index d2c7324fc..638863dd2 100644
--- a/progression-performance-test/pom.xml
+++ b/progression-performance-test/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-parent</artifactId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/progression-query/pom.xml b/progression-query/pom.xml
index d6a7dbdc0..061c80365 100644
--- a/progression-query/pom.xml
+++ b/progression-query/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-parent</artifactId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
     <artifactId>progression-query</artifactId>
     <packaging>pom</packaging>
diff --git a/progression-query/progression-query-api/pom.xml b/progression-query/progression-query-api/pom.xml
index dbe64936f..53d666736 100644
--- a/progression-query/progression-query-api/pom.xml
+++ b/progression-query/progression-query-api/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-query</artifactId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
     <artifactId>progression-query-api</artifactId>
     <packaging>war</packaging>
diff --git a/progression-query/progression-query-view/pom.xml b/progression-query/progression-query-view/pom.xml
index 122cabafa..0142588d9 100644
--- a/progression-query/progression-query-view/pom.xml
+++ b/progression-query/progression-query-view/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-query</artifactId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
     <artifactId>progression-query-view</artifactId>
     <packaging>jar</packaging>
diff --git a/progression-refdata-service/pom.xml b/progression-refdata-service/pom.xml
index 2b82888ca..b827a6ace 100644
--- a/progression-refdata-service/pom.xml
+++ b/progression-refdata-service/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-parent</artifactId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/progression-service/pom.xml b/progression-service/pom.xml
index c49bb5ca0..e8ca46102 100644
--- a/progression-service/pom.xml
+++ b/progression-service/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-parent</artifactId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/progression-test-utilities/pom.xml b/progression-test-utilities/pom.xml
index 3fe4ac628..c75c48b26 100644
--- a/progression-test-utilities/pom.xml
+++ b/progression-test-utilities/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-parent</artifactId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
 
     <properties>
diff --git a/progression-viewstore/pom.xml b/progression-viewstore/pom.xml
index 28b924677..2fb3186cd 100644
--- a/progression-viewstore/pom.xml
+++ b/progression-viewstore/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-parent</artifactId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
     <artifactId>progression-viewstore</artifactId>
     <packaging>pom</packaging>
diff --git a/progression-viewstore/progression-viewstore-liquibase/pom.xml b/progression-viewstore/progression-viewstore-liquibase/pom.xml
index df8af95df..65566310d 100644
--- a/progression-viewstore/progression-viewstore-liquibase/pom.xml
+++ b/progression-viewstore/progression-viewstore-liquibase/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-viewstore</artifactId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
 
     <artifactId>progression-viewstore-liquibase</artifactId>
diff --git a/progression-viewstore/progression-viewstore-liquibase/src/main/resources/liquibase/refactor-court-application-constraints-and-mdch-index.xml b/progression-viewstore/progression-viewstore-liquibase/src/main/resources/liquibase/refactor-court-application-constraints-and-mdch-index.xml
new file mode 100644
index 000000000..4a10e31fa
--- /dev/null
+++ b/progression-viewstore/progression-viewstore-liquibase/src/main/resources/liquibase/refactor-court-application-constraints-and-mdch-index.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+         http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.3.xsd">
+
+
+    <!-- Dropped unique constraint on case_id and application_id (if exists) to allow duplicate
+    court application mappings where required. -->
+
+    <changeSet id="drop-uk-court-application-case-if-exists" author="cpp.context.progression">
+        <preConditions onFail="MARK_RAN">
+            <and>
+                <tableExists tableName="court_application_case"/>
+                <uniqueConstraintExists tableName="court_application_case" constraintName="court_application_case_unique_key"/>
+            </and>
+        </preConditions>
+        <dropUniqueConstraint tableName="court_application_case"
+                               constraintName="court_application_case_unique_key"/>
+    </changeSet>
+
+
+    <!-- Added unique constraint (if not exists) on case_id and application_id to enforce data integrity and
+     prevent duplicate court application mappings. -->
+
+    <changeSet id="add-uk-court-application-case-caseid-first-if-not-exists" author="cpp.context.progression">
+        <preConditions onFail="MARK_RAN">
+            <and>
+                <tableExists tableName="court_application_case"/>
+                <not>
+                    <uniqueConstraintExists tableName="court_application_case" constraintName="court_application_case_unique_key"/>
+                </not>
+            </and>
+        </preConditions>
+        <addUniqueConstraint tableName="court_application_case"
+                             columnNames="case_id, application_id"
+                             constraintName="court_application_case_unique_key"/>
+    </changeSet>
+
+
+    <!-- Added index on prosecution_case_id (if not exists) to optimize ProgressionViewStore
+    query filtering and improve performance by reducing full table scans. -->
+    <changeSet id="add-index-match-defendant-case-hearing-prosecution-case-id-if-not-exists" author="cpp.context.progression">
+        <preConditions onFail="MARK_RAN">
+            <and>
+                <tableExists tableName="match_defendant_case_hearing"/>
+                <not>
+                    <indexExists indexName="match_defendant_case_hearing_prosecution_case_id_idx"/>
+                </not>
+            </and>
+        </preConditions>
+        <createIndex tableName="match_defendant_case_hearing"
+                     indexName="match_defendant_case_hearing_prosecution_case_id_idx">
+            <column name="prosecution_case_id"/>
+        </createIndex>
+    </changeSet>
+
+</databaseChangeLog>
diff --git a/progression-viewstore/progression-viewstore-liquibase/src/main/resources/liquibase/view-store-db-changelog.xml b/progression-viewstore/progression-viewstore-liquibase/src/main/resources/liquibase/view-store-db-changelog.xml
index 540d022aa..5f4728a4d 100644
--- a/progression-viewstore/progression-viewstore-liquibase/src/main/resources/liquibase/view-store-db-changelog.xml
+++ b/progression-viewstore/progression-viewstore-liquibase/src/main/resources/liquibase/view-store-db-changelog.xml
@@ -119,4 +119,5 @@
     <include file="liquibase/update-civil-fee-and-related-reference.xml"/>
     <include file="liquibase/remove-column-offence-id-from-civil-fee.xml"/>
     <include file="liquibase/add-document-metadata-to-court-document.xml"/>
+    <include file="liquibase/refactor-court-application-constraints-and-mdch-index.xml"/>
 </databaseChangeLog>
\ No newline at end of file
diff --git a/progression-viewstore/progression-viewstore-persistence/pom.xml b/progression-viewstore/progression-viewstore-persistence/pom.xml
index 0714e1af3..815f374d6 100644
--- a/progression-viewstore/progression-viewstore-persistence/pom.xml
+++ b/progression-viewstore/progression-viewstore-persistence/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.moj.cpp.progression</groupId>
         <artifactId>progression-viewstore</artifactId>
-        <version>17.0.270-SNAPSHOT</version>
+        <version>17.0.270-PDE-977-SNAPSHOT</version>
     </parent>
 
     <artifactId>progression-viewstore-persistence</artifactId>