diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 32f90cc83c..3744e8b8f2 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -26,8 +26,8 @@ configurations.configureEach {
     exclude(module = "commons-logging")
 }
 
-val canonicalVersionCode = 431
-val canonicalVersionName = "1.29.2"
+val canonicalVersionCode = 432
+val canonicalVersionName = "1.29.3"
 
 val postFixSize = 10
 val abiPostFix = mapOf(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationHandler.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationHandler.kt
index 3208180414..2e904cec1d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationHandler.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationHandler.kt
@@ -13,7 +13,6 @@ import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Semaphore
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationWorker.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationWorker.kt
index 68b8f9a2f8..97302d8337 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationWorker.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/PushRegistrationWorker.kt
@@ -172,6 +172,10 @@ class PushRegistrationWorker @AssistedInject constructor(
         buildRequest: (T) -> Req,
         sendBatchRequest: suspend (Collection<Req>) -> List<Res>,
     ): List<Pair<T, kotlin.Result<Unit>>> {
+        if (items.isEmpty()) {
+            return emptyList()
+        }
+
         val results = ArrayList<Pair<T, kotlin.Result<Unit>>>(items.size)
 
         val batchRequestItems = mutableListOf<T>()
diff --git a/scripts/build-and-release.py b/scripts/build-and-release.py
index baa2386433..cc020f0368 100755
--- a/scripts/build-and-release.py
+++ b/scripts/build-and-release.py
@@ -151,9 +151,11 @@ def update_fdroid(build: BuildResult, fdroid_workspace: str, creds: BuildCredent
 
     # Make sure there are only last three versions of APKs
     all_apk_versions_and_ctime = [(re.search(r'session-(.+?)-', os.path.basename(name)).group(1), os.path.getmtime(name))
-                            for name in glob.glob(os.path.join(fdroid_workspace, 'repo/session-*-arm64-v8a.apk'))]
+                            for name in glob.glob(os.path.join(fdroid_workspace, 'repo/session-*-arm64-v8a*.apk'))]
+    
     # Sort by ctime DESC
     all_apk_versions_and_ctime.sort(key=lambda x: x[0], reverse=True)
+
     # Remove all but the last three versions
     for version, _ in all_apk_versions_and_ctime[KEEP_FDROID_VERSIONS:]:
         for apk in glob.glob(os.path.join(fdroid_workspace, f'repo/session-{version}-*.apk')):