diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/146-add-indexes-to-file-table.yaml b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/146-add-indexes-to-file-table.yaml
index 756435813..3befae500 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/146-add-indexes-to-file-table.yaml
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/146-add-indexes-to-file-table.yaml
@@ -3,6 +3,7 @@ databaseChangeLog:
       id: add-indexes-to-file-table
       author: timo
       preConditions:
+        - onFail: MARK_RAN
         - not:
             indexExists:
               indexName: file_dossier_id_last_updated_idx
@@ -21,6 +22,7 @@ databaseChangeLog:
       id: add-indexes-to-file-table2
       author: timo
       preConditions:
+        - onFail: MARK_RAN
         - not:
             indexExists:
               indexName: file_dossier_id_deleted_hard_deleted_time_idx
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/150-add-indexes-across-tables-for-performance.yaml b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/150-add-indexes-across-tables-for-performance.yaml
index 40f8645d2..cfb52d927 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/150-add-indexes-across-tables-for-performance.yaml
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/150-add-indexes-across-tables-for-performance.yaml
@@ -3,6 +3,7 @@ databaseChangeLog:
       id: create_index_if_not_exists_idx_file_last_updated
       author: Timo
       preConditions:
+        - onFail: MARK_RAN
         - not:
             indexExists:
               indexName: idx_file_last_updated
@@ -19,6 +20,7 @@ databaseChangeLog:
       id: create_index_if_not_exists_idx_file_deleted_hard_deleted_time
       author: Timo
       preConditions:
+        - onFail: MARK_RAN
         - not:
             indexExists:
               indexName: idx_file_deleted_hard_deleted_time
@@ -37,6 +39,7 @@ databaseChangeLog:
       id: create_index_if_not_exists_idx_file_dossier_id_deleted_hard_deleted_time
       author: Timo
       preConditions:
+        - onFail: MARK_RAN
         - not:
             indexExists:
               indexName: idx_file_dossier_id_deleted_hard_deleted_time
@@ -57,6 +60,7 @@ databaseChangeLog:
       id: create_index_if_not_exists_idx_dossier_last_updated
       author: Timo
       preConditions:
+        - onFail: MARK_RAN
         - not:
             indexExists:
               indexName: idx_dossier_last_updated
@@ -73,6 +77,7 @@ databaseChangeLog:
       id: create_index_if_not_exists_idx_dossier_soft_deleted_time_hard_deleted_time
       author: Timo
       preConditions:
+        - onFail: MARK_RAN
         - not:
             indexExists:
               indexName: idx_dossier_soft_deleted_time_hard_deleted_time
@@ -91,6 +96,7 @@ databaseChangeLog:
       id: create_index_if_not_exists_idx_dossier_id_soft_deleted_time_hard_deleted_time
       author: Timo
       preConditions:
+        - onFail: MARK_RAN
         - not:
             indexExists:
               indexName: idx_dossier_id_soft_deleted_time_hard_deleted_time
@@ -111,6 +117,7 @@ databaseChangeLog:
       id: create_index_if_not_exists_idx_dossier_soft_deleted_time_hard_deleted_time_archived_time
       author: Timo
       preConditions:
+        - onFail: MARK_RAN
         - not:
             indexExists:
               indexName: idx_dossier_soft_deleted_time_hard_deleted_time_archived_time
@@ -131,6 +138,7 @@ databaseChangeLog:
       id: create_index_if_not_exists_idx_dossier_dossier_template_id_soft_deleted_time_hard_deleted_time_archived_time
       author: Timo
       preConditions:
+        - onFail: MARK_RAN
         - not:
             indexExists:
               indexName: idx_dossier_dossier_template_id_soft_deleted_time_hard_deleted_time_archived_time
@@ -153,6 +161,7 @@ databaseChangeLog:
       id: create_index_if_not_exists_idx_notification_preference_user_id_in_app_notifications_enabled
       author: Timo
       preConditions:
+        - onFail: MARK_RAN
         - not:
             indexExists:
               indexName: idx_notification_preference_user_id_in_app_notifications_enabled
@@ -171,6 +180,7 @@ databaseChangeLog:
       id: create_index_if_not_exists_idx_notification_user_id_creation_date_soft_deleted
       author: Timo
       preConditions:
+        - onFail: MARK_RAN
         - not:
             indexExists:
               indexName: idx_notification_user_id_creation_date_soft_deleted
@@ -191,6 +201,7 @@ databaseChangeLog:
       id: create_index_if_not_exists_idx_entity_dossier_template_id
       author: Timo
       preConditions:
+        - onFail: MARK_RAN
         - not:
             indexExists:
               indexName: idx_entity_dossier_template_id
@@ -207,6 +218,7 @@ databaseChangeLog:
       id: create_index_if_not_exists_idx_entity_dossier_id
       author: Timo
       preConditions:
+        - onFail: MARK_RAN
         - not:
             indexExists:
               indexName: idx_entity_dossier_id
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/151-add-component-mapping-indexes.yaml b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/151-add-component-mapping-indexes.yaml
index aee3dd427..fa9fc8943 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/151-add-component-mapping-indexes.yaml
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/151-add-component-mapping-indexes.yaml
@@ -3,6 +3,7 @@ databaseChangeLog:
       id: create_index_if_not_exists_idx_component_mappings_dossier_template_id
       author: Timo
       preConditions:
+        - onFail: MARK_RAN
         - not:
             indexExists:
               indexName: idx_component_mappings_dossier_template_id
@@ -19,6 +20,7 @@ databaseChangeLog:
       id: create_index_if_not_exists_idx_component_mappings_dossier_template_id_name
       author: Timo
       preConditions:
+        - onFail: MARK_RAN
         - not:
             indexExists:
               indexName: idx_component_mappings_dossier_template_id_name
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/153-custom-technical-name-change.yaml b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/153-custom-technical-name-change.yaml
index dbaf90625..1e0525483 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/153-custom-technical-name-change.yaml
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/153-custom-technical-name-change.yaml
@@ -11,6 +11,7 @@ databaseChangeLog:
       id: technical-name-change-index
       author: maverick
       preConditions:
+        - onFail: MARK_RAN
         - not:
             indexExists:
               indexName: idx_legal_basis_mapping_entity_dossier_template_id