diff --git a/CHANGELOG.md b/CHANGELOG.md
index 954864cf4..7d326517b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -171,6 +171,11 @@
 - Refactor: centralize group allowlist/mention policy across providers.
 - Deps: update to latest across the repo.
 
+## 2026.1.7
+
+### Fixes
+- Android: bump version to 2026.1.7, add version code, and name APK outputs. Thanks @fcatuhe for PR #402.
+
 ## 2026.1.5-3
 
 ### Fixes
diff --git a/apps/android/app/build.gradle.kts b/apps/android/app/build.gradle.kts
index 00e5b8674..b8b490523 100644
--- a/apps/android/app/build.gradle.kts
+++ b/apps/android/app/build.gradle.kts
@@ -19,8 +19,8 @@ android {
     applicationId = "com.clawdbot.android"
     minSdk = 31
     targetSdk = 36
-    versionCode = 1
-    versionName = "2026.1.5"
+    versionCode = 20260107
+    versionName = "2026.1.7"
   }
 
   buildTypes {
@@ -29,14 +29,6 @@ android {
     }
   }
 
-  applicationVariants.all {
-    val variant = this
-    outputs.all {
-      val output = this as com.android.build.gradle.internal.api.BaseVariantOutputImpl
-      output.outputFileName = "clawdbot-${variant.versionName}-${variant.buildType.name}.apk"
-    }
-  }
-
   buildFeatures {
     compose = true
     buildConfig = true
@@ -62,6 +54,16 @@ android {
   }
 }
 
+androidComponents {
+  onVariants { variant ->
+    variant.outputs.forEach { output ->
+      val apkOutput = output as? com.android.build.api.variant.ApkVariantOutput ?: return@forEach
+      val versionName = variant.versionName.orNull ?: "0"
+      apkOutput.outputFileName.set("clawdbot-${versionName}-${variant.name}.apk")
+    }
+  }
+}
+
 kotlin {
   compilerOptions {
     jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17)
diff --git a/docs/install/updating.md b/docs/install/updating.md
index 11846ccbc..f6e045c4e 100644
--- a/docs/install/updating.md
+++ b/docs/install/updating.md
@@ -97,7 +97,7 @@ Runbook + exact service labels: [Gateway runbook](/gateway)
 Install a known-good version:
 
 ```bash
-npm i -g clawdbot@2026.1.5-3
+npm i -g clawdbot@2026.1.7
 ```
 
 Then restart + re-run doctor:
diff --git a/package.json b/package.json
index 26b097c81..d669de56e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "clawdbot",
-  "version": "2026.1.5-3",
+  "version": "2026.1.7",
   "description": "WhatsApp gateway CLI (Baileys web) with Pi RPC agent",
   "type": "module",
   "main": "dist/index.js",