diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/MainActivity.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/MainActivity.kt
index 392711bf..adcbc8d4 100644
--- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/MainActivity.kt
+++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/MainActivity.kt
@@ -256,11 +256,15 @@ class MainActivity : AppCompatActivity() {
                                                 textDecoration = TextDecoration.Underline,
                                                 color = MaterialTheme.colorScheme.primary,
                                             ),
-                                        focusedStyle = SpanStyle(
-                                            textDecoration = TextDecoration.Underline,
-                                            color = MaterialTheme.colorScheme.primary,
-                                            background = MaterialTheme.colorScheme.primary.copy(alpha = 0.2f)
-                                        )
+                                        focusedStyle =
+                                            SpanStyle(
+                                                textDecoration = TextDecoration.Underline,
+                                                color = MaterialTheme.colorScheme.primary,
+                                                background =
+                                                    MaterialTheme.colorScheme.primary.copy(
+                                                        alpha = 0.2f
+                                                    ),
+                                            ),
                                     ),
                             ) {
                                 snackbarState.dismissCurrent()
diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/data/repository/GitHubUpdateRepository.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/data/repository/GitHubUpdateRepository.kt
index b8681b8e..11ae194c 100644
--- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/data/repository/GitHubUpdateRepository.kt
+++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/data/repository/GitHubUpdateRepository.kt
@@ -38,27 +38,40 @@ class GitHubUpdateRepository(
                     gitHubApi.getLatestRelease(githubOwner, githubRepo).onFailure(Timber::e)
                 }
             release.map { release ->
-                val standaloneApkAsset =
+                val universalApkAsset =
                     release.assets.find { asset ->
-                        asset.name.startsWith("wgtunnel-${Constants.STANDALONE_FLAVOR}-v") &&
-                            asset.name.endsWith(".apk")
+                        val prefix = "wgtunnel-${Constants.STANDALONE_FLAVOR}-v"
+                        val apkSuffix = ".apk"
+                        asset.name.startsWith(prefix) &&
+                            asset.name.endsWith(apkSuffix) &&
+                            !asset.name.endsWith("-arm64$apkSuffix") &&
+                            !asset.name.endsWith("-armv7$apkSuffix")
                     }
                 val newVersion =
-                    standaloneApkAsset
+                    universalApkAsset
                         ?.name
                         ?.removePrefix("wgtunnel-${Constants.STANDALONE_FLAVOR}-v")
                         ?.removeSuffix(".apk") ?: return@map null
 
                 Timber.i("Latest version: $newVersion, current version: $currentVersion")
-                if (isNightly && newVersion != currentVersion)
-                    return@map GitHubReleaseMapper.toAppUpdate(release, newVersion)
-                if (NumberUtils.compareVersions(newVersion, currentVersion) > 0) {
-                    GitHubReleaseMapper.toAppUpdate(
-                        release.copy(assets = listOf(standaloneApkAsset)),
-                        newVersion,
-                    )
+                if (isNightly) {
+                    if (newVersion != currentVersion) {
+                        GitHubReleaseMapper.toAppUpdate(
+                            release.copy(assets = listOf(universalApkAsset)),
+                            newVersion,
+                        )
+                    } else {
+                        null
+                    }
                 } else {
-                    null
+                    if (NumberUtils.compareVersions(newVersion, currentVersion) > 0) {
+                        GitHubReleaseMapper.toAppUpdate(
+                            release.copy(assets = listOf(universalApkAsset)),
+                            newVersion,
+                        )
+                    } else {
+                        null
+                    }
                 }
             }
         }
diff --git a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/support/components/UpdateDialog.kt b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/support/components/UpdateDialog.kt
index d3a1de88..2b7cde5f 100644
--- a/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/support/components/UpdateDialog.kt
+++ b/app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/support/components/UpdateDialog.kt
@@ -77,7 +77,7 @@ fun UpdateDialog(viewModel: SupportViewModel, context: Context, onPermissionNeed
 
                 Text(text = annotatedString)
                 if (supportState.isLoading) {
-                    val stroke = Stroke(cap = StrokeCap.Round)
+                    val stroke = Stroke(cap = StrokeCap.Round, width = 4.0f)
                     LinearWavyProgressIndicator(
                         progress = { supportState.downloadProgress },
                         modifier = Modifier.fillMaxWidth().padding(top = 16.dp),