diff --git a/app/src/main/java/io/xpipe/app/storage/DataStorageCompatibilityCheck.java b/app/src/main/java/io/xpipe/app/storage/DataStorageCompatibilityCheck.java
index 129866751..71ccd6d1b 100644
--- a/app/src/main/java/io/xpipe/app/storage/DataStorageCompatibilityCheck.java
+++ b/app/src/main/java/io/xpipe/app/storage/DataStorageCompatibilityCheck.java
@@ -53,7 +53,7 @@ public class DataStorageCompatibilityCheck {
         ErrorEventFactory.fromMessage(
                         "The vault" + (version.isPresent() ? " from v" + version.get() + " " : " ")
                                 + "comes from an XPipe version prior to v24."
-                                + " This legacy format is unsupported in newer versions. To migrate your data, you need to first install and launch XPipe v23.99."
+                                + " This legacy format is unsupported in newer versions. To migrate your data, you need to first install and launch XPipe v23.99.x."
                                 + " This will start a migration for the vault data. Afterwards, you can upgrade to XPipe v24+ and launch it as normal.")
                 .customAction(new ErrorAction() {
                     @Override
@@ -63,7 +63,7 @@ public class DataStorageCompatibilityCheck {
 
                     @Override
                     public String getDescription() {
-                        return "Download and launch XPipe v23.99 to perform the migration";
+                        return "Download and launch XPipe v23.99.x to perform the migration";
                     }
 
                     @Override
@@ -78,7 +78,7 @@ public class DataStorageCompatibilityCheck {
     }
 
     private static void runTransitoryBuild() throws Exception {
-        var version = AppProperties.get().isStaging() ? "23.99-5" : "23.99";
+        var version = AppProperties.get().isStaging() ? "23.99-5" : "23.99.2";
         var downloaded = AppDownloads.downloadArtifact(AppRelease.ofPortable(version));
         var tempTarget = AppSystemInfo.ofCurrent().getTemp().resolve("xpipe-v23.99");
         var shell = LocalShell.get(DataStorageCompatibilityCheck.class);
diff --git a/dist/changelog/24.0.3.md b/dist/changelog/24.0.3.md
new file mode 100644
index 000000000..08f5f66a3
--- /dev/null
+++ b/dist/changelog/24.0.3.md
@@ -0,0 +1,3 @@
+- Fix another startup error when a migrated vault had KeePassXC associated with it
+- Fix NullPointer when changing role access for a synced identity while git sync was disabled
+- Fix a few migration corruption issues for the v23.99.x updates
diff --git a/dist/changelog/24.0.md b/dist/changelog/24.0.md
index 73810949f..f3a11d770 100644
--- a/dist/changelog/24.0.md
+++ b/dist/changelog/24.0.md
@@ -2,7 +2,7 @@
 
 Up until now, XPipe updates have automatically migrated data and supported legacy vaults since XPipe v1.0. Since then, quite a few issues have accumulated, so it is best action to fix those all at once. This will result in some incompatibilities and migration limitations when upgrading an existing install to v24+:
 
-- Upgrading directly to v24 is only possible from [v23.99](https://github.com/xpipe-io/xpipe/releases/tag/23.99). If you are running an earlier version of XPipe, please update first to v23.99 and launch it once to initiate a vault migration. After that is done, you can upgrade to v24.
+- Upgrading directly to v24 is only possible from [v23.99](https://github.com/xpipe-io/xpipe/releases/tag/23.99.1). If you are running an earlier version of XPipe, please update first to v23.99 and launch it once to initiate a vault migration. After that is done, you can upgrade to v24.
 
 - Vaults with custom user passphrases set will remove all custom user passphrases in that migration. You can re-create those in v24 once the vault was migrated. The git sync is disabled until then, so you can't push the vault in that state to the repo
 
diff --git a/version b/version
index a19540167..99851478b 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-24.0.2
+24.0.3