diff --git a/android/app/build.gradle b/android/app/build.gradle
index ef59c2ac4..bc33501d7 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -66,8 +66,8 @@ android {
     buildTypes {
         debug {
             signingConfig signingConfigs.debug
-            applicationIdSuffix ".debug"
-            versionNameSuffix "-debug"
+            applicationIdSuffix ""
+            versionNameSuffix ""
         }
         release {
             signingConfig signingConfigs.release
diff --git a/scripts/prepare-web.sh b/scripts/prepare-web.sh
index 0c4283e69..798bbe37f 100755
--- a/scripts/prepare-web.sh
+++ b/scripts/prepare-web.sh
@@ -1,6 +1,10 @@
 #!/bin/sh -ve
 rm -r assets/js/package
-cd assets/js/ && curl -L $(curl -s 'https://api.github.com/repos/famedly/olm/releases' | jq -r '.[0] | .assets | .[0] | .browser_download_url') > olm.zip && cd ../../
+
+OLM_VERSION=$(cat pubspec.yaml | yq .dependencies.flutter_olm)
+DOWNLOAD_PATH="https://github.com/famedly/olm/releases/download/v$OLM_VERSION/olm.zip"
+
+cd assets/js/ && curl -L $DOWNLOAD_PATH > olm.zip && cd ../../
 cd assets/js/ && unzip olm.zip && cd ../../
 cd assets/js/ && rm olm.zip && cd ../../
-cd assets/js/ && mv javascript package && cd ../../
+cd assets/js/ && mv javascript package && cd ../../
\ No newline at end of file