diff --git a/stub/build.gradle b/stub/build.gradle
index c43fcc5a8..932b547fc 100644
--- a/stub/build.gradle
+++ b/stub/build.gradle
@@ -4,7 +4,7 @@ android {
     defaultConfig {
         applicationId 'com.topjohnwu.magisk'
         versionCode 1
-        versionName "1.0"
+        versionName props['appVersion']
         buildConfigField 'String', 'DEV_CHANNEL', props['DEV_CHANNEL'] ?: 'null'
     }
 
diff --git a/stub/src/main/java/com/topjohnwu/magisk/DownloadActivity.java b/stub/src/main/java/com/topjohnwu/magisk/DownloadActivity.java
index 38e1e9c5e..231a24d54 100644
--- a/stub/src/main/java/com/topjohnwu/magisk/DownloadActivity.java
+++ b/stub/src/main/java/com/topjohnwu/magisk/DownloadActivity.java
@@ -24,9 +24,10 @@ import static com.topjohnwu.magisk.DelegateApplication.MANAGER_APK;
 
 public class DownloadActivity extends Activity {
 
+    private static final boolean CANARY = BuildConfig.VERSION_NAME.contains("-");
     private static final String URL =
-            BuildConfig.DEV_CHANNEL != null ? BuildConfig.DEV_CHANNEL :
-            RawData.urlBase() + (BuildConfig.DEBUG ? RawData.canary() : RawData.stable());
+            BuildConfig.DEV_CHANNEL != null ? BuildConfig.DEV_CHANNEL : RawData.urlBase() +
+            (BuildConfig.DEBUG ? RawData.debug() : (CANARY ? RawData.canary() : RawData.stable()));
 
     private String apkLink;
     private ErrorHandler err = (conn, e) -> {
@@ -71,7 +72,7 @@ public class DownloadActivity extends Activity {
             new AlertDialog.Builder(this)
                     .setCancelable(false)
                     .setTitle(RawData.appName())
-                    .setMessage(RawData.no_internet_msg())
+                    .setMessage(RawData.networkError())
                     .setNegativeButton(ok, (d, w) -> finish())
                     .show();
         }
@@ -87,7 +88,7 @@ public class DownloadActivity extends Activity {
                 new AlertDialog.Builder(DownloadActivity.this)
                         .setCancelable(false)
                         .setTitle(RawData.appName())
-                        .setMessage(RawData.upgrade_msg())
+                        .setMessage(RawData.upgradeMsg())
                         .setPositiveButton(yes, (d, w) -> dlAPK())
                         .setNegativeButton(no, (d, w) -> finish())
                         .show();
diff --git a/stub/src/main/java/com/topjohnwu/magisk/obfuscate/RawData.java b/stub/src/main/java/com/topjohnwu/magisk/obfuscate/RawData.java
index da3dabd4e..27ce8cf92 100644
--- a/stub/src/main/java/com/topjohnwu/magisk/obfuscate/RawData.java
+++ b/stub/src/main/java/com/topjohnwu/magisk/obfuscate/RawData.java
@@ -16,19 +16,23 @@ public class RawData {
         return "https://raw.githubusercontent.com/topjohnwu/magisk_files/";
     }
 
-    public static String canary() {
+    public static String debug() {
         return "canary/debug.json";
     }
 
+    public static String canary() {
+        return "canary/release.json";
+    }
+
     public static String stable() {
         return "master/stable.json";
     }
 
-    public static String no_internet_msg() {
+    public static String networkError() {
         return res.getString(R.string.no_internet_msg);
     }
 
-    public static String upgrade_msg() {
+    public static String upgradeMsg() {
         return res.getString(R.string.upgrade_msg);
     }