diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/lifecycle/AppVersionTracker.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/lifecycle/AppVersionTracker.java
index f2d00cfca..a6dab0d2a 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/lifecycle/AppVersionTracker.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/lifecycle/AppVersionTracker.java
@@ -39,6 +39,10 @@ public class AppVersionTracker {
                         return;
                     }
 
+                    if (appVersion.isBlank() || layoutParserVersion.isBlank()) {
+                        log.info("No app version {} / layout parser version {} was provided. Version tracking skipped. ", appVersion, layoutParserVersion);
+                    }
+
                     TenantContext.setTenantId(tenant.getTenantId());
 
                     try {
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/db.changelog-tenant.yaml b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/db.changelog-tenant.yaml
index 017d13960..1678a6207 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/db.changelog-tenant.yaml
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/db.changelog-tenant.yaml
@@ -242,9 +242,9 @@ databaseChangeLog:
   - include:
       file: db/changelog/tenant/149-remove-based-on-dict-annotation-id-columns.yaml
   - include:
-      file: db/changelog/tenant/150-add-indexes-across-tables-for-performance.yaml
+      file: db/changelog/tenant/149-add-indexes-across-tables-for-performance.yaml
   - include:
-      file: db/changelog/tenant/151-add-component-mapping-indexes.yaml
+      file: db/changelog/tenant/150-add-component-mapping-indexes.yaml
   - include:
       file: db/changelog/tenant/152-add-ai-fields-to-entity.yaml
   - include:
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/149-add-indexes-across-tables-for-performance.yaml
similarity index 100%
rename from persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/150-add-indexes-across-tables-for-performance.yaml
rename to persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/149-add-indexes-across-tables-for-performance.yaml
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/150-add-component-mapping-indexes.yaml
similarity index 100%
rename from persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/151-add-component-mapping-indexes.yaml
rename to persistence-service-v1/persistence-service-processor-v1/src/main/resources/db/changelog/tenant/150-add-component-mapping-indexes.yaml