diff --git a/Overlord-Server/public/build.html b/Overlord-Server/public/build.html
index 56a2859..3ed3134 100644
--- a/Overlord-Server/public/build.html
+++ b/Overlord-Server/public/build.html
@@ -171,6 +171,39 @@
                     />
                     <span><i class="fa-brands fa-linux text-cyan-300"></i> FreeBSD ARM64</span>
                   </label>
+                  <label
+                    class="flex items-center gap-2 p-3 bg-slate-800/60 border border-slate-700 rounded-lg cursor-pointer hover:border-blue-500 transition-colors"
+                  >
+                    <input
+                      type="checkbox"
+                      name="platform"
+                      value="android-arm64"
+                      class="w-4 h-4"
+                    />
+                    <span><i class="fa-brands fa-android text-green-400"></i> Android ARM64</span>
+                  </label>
+                  <label
+                    class="flex items-center gap-2 p-3 bg-slate-800/60 border border-slate-700 rounded-lg cursor-pointer hover:border-blue-500 transition-colors"
+                  >
+                    <input
+                      type="checkbox"
+                      name="platform"
+                      value="android-amd64"
+                      class="w-4 h-4"
+                    />
+                    <span><i class="fa-brands fa-android text-green-400"></i> Android x64</span>
+                  </label>
+                  <label
+                    class="flex items-center gap-2 p-3 bg-slate-800/60 border border-slate-700 rounded-lg cursor-pointer hover:border-blue-500 transition-colors"
+                  >
+                    <input
+                      type="checkbox"
+                      name="platform"
+                      value="android-armv7"
+                      class="w-4 h-4"
+                    />
+                    <span><i class="fa-brands fa-android text-green-400"></i> Android ARMv7</span>
+                  </label>
                 </div>
               </div>
 
diff --git a/Overlord-Server/src/server/build-process.ts b/Overlord-Server/src/server/build-process.ts
index 0f52cb8..feeb194 100644
--- a/Overlord-Server/src/server/build-process.ts
+++ b/Overlord-Server/src/server/build-process.ts
@@ -170,7 +170,7 @@ export async function startBuildProcess(
 
     for (const platform of platformsToBuild) {
       const [os, arch, ...rest] = platform.split("-");
-      const goarm = rest[0] === "armv7" ? "7" : undefined;
+      const goarm = arch === "armv7" ? "7" : undefined;
       const actualArch = goarm ? "arm" : arch;
       const outputName = deps.sanitizeOutputName(
         platform.includes("windows") ? `agent-${platform}.exe` : `agent-${platform}`,
diff --git a/Overlord-Server/src/server/validation-constants.ts b/Overlord-Server/src/server/validation-constants.ts
index c7b7ee2..c2ca0e1 100644
--- a/Overlord-Server/src/server/validation-constants.ts
+++ b/Overlord-Server/src/server/validation-constants.ts
@@ -25,4 +25,7 @@ export const ALLOWED_PLATFORMS = new Set([
   "darwin-arm64",
   "freebsd-amd64",
   "freebsd-arm64",
+  "android-arm64",
+  "android-amd64",
+  "android-armv7",
 ]);
diff --git a/build-clients.bat b/build-clients.bat
index 6de1220..42d07f0 100644
--- a/build-clients.bat
+++ b/build-clients.bat
@@ -145,6 +145,29 @@ set CGO_ENABLED=0
 %BUILD_CMD% %BUILD_TAGS% -ldflags="%LDFLAGS%" -o "%OUT_DIR%\agent-freebsd-arm64" ./cmd/agent
 if errorlevel 1 goto :err
 
+echo == Building agent for android arm64 ==
+set GOOS=android
+set GOARCH=arm64
+set CGO_ENABLED=0
+%BUILD_CMD% %BUILD_TAGS% -ldflags="%LDFLAGS%" -o "%OUT_DIR%\agent-android-arm64" ./cmd/agent
+if errorlevel 1 goto :err
+
+echo == Building agent for android amd64 ==
+set GOOS=android
+set GOARCH=amd64
+set CGO_ENABLED=0
+%BUILD_CMD% %BUILD_TAGS% -ldflags="%LDFLAGS%" -o "%OUT_DIR%\agent-android-amd64" ./cmd/agent
+if errorlevel 1 goto :err
+
+echo == Building agent for android arm (armv7) ==
+set GOOS=android
+set GOARCH=arm
+set GOARM=7
+set CGO_ENABLED=0
+%BUILD_CMD% %BUILD_TAGS% -ldflags="%LDFLAGS%" -o "%OUT_DIR%\agent-android-armv7" ./cmd/agent
+if errorlevel 1 goto :err
+set GOARM=
+
 echo == Building agent for openbsd amd64 ==
 set GOOS=openbsd
 set GOARCH=amd64