diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
index e4f7ccc6..8d6c0b4a 100644
--- a/.github/workflows/nightly-build.yml
+++ b/.github/workflows/nightly-build.yml
@@ -83,6 +83,7 @@ jobs:
           apk_path="banafsh-nightly.apk"
           curl https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendDocument \
             -F chat_id=${{ secrets.TELEGRAM_CHAT_ID }} \
+            -F message_thread_id=15 \
             -F "caption=Size: $(ls -l --block-size=K "$apk_path" | awk '{ print $5 }')" \
             -F parse_mode=HTML \
             -F document=@"$apk_path"
diff --git a/.github/workflows/telegram-notify.yml b/.github/workflows/telegram-notify.yml
index f89710c2..262c2f65 100644
--- a/.github/workflows/telegram-notify.yml
+++ b/.github/workflows/telegram-notify.yml
@@ -31,6 +31,7 @@ jobs:
             text: .,
             disable_web_page_preview: true,
             chat_id: "${{ secrets.TELEGRAM_CHAT_ID }}",
+            message_thread_id: 15,
             parse_mode: "HTML"
           }' | \
           curl -X POST https://api.telegram.org/bot${{ secrets.TELEGRAM_TOKEN }}/sendMessage \
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index b220bacf..ef4015b0 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -22,6 +22,8 @@ android {
         versionName = project.version.toString()
 
         multiDexEnabled = true
+
+        setProperty("archivesBaseName", "Banafsh-$versionName-$gitInfo")
     }
 
     splits {