diff --git a/backend/mpc-system/services/service-party-android/build-apk.bat b/backend/mpc-system/services/service-party-android/build-apk.bat
index f2ed32e8..b7ace430 100644
--- a/backend/mpc-system/services/service-party-android/build-apk.bat
+++ b/backend/mpc-system/services/service-party-android/build-apk.bat
@@ -23,9 +23,12 @@ if not exist "local.properties" (
 
     :: Check ANDROID_HOME environment variable first
     if defined ANDROID_HOME (
-        if exist "!ANDROID_HOME!\platform-tools" (
-            echo sdk.dir=!ANDROID_HOME:\=/!> local.properties
-            echo [INFO] Created local.properties with ANDROID_HOME: !ANDROID_HOME!
+        :: Remove any surrounding quotes from ANDROID_HOME
+        set "ANDROID_HOME_CLEAN=!ANDROID_HOME:"=!"
+        if exist "!ANDROID_HOME_CLEAN!\platform-tools" (
+            set "SDK_PATH_CLEAN=!ANDROID_HOME_CLEAN:\=/!"
+            echo sdk.dir=!SDK_PATH_CLEAN!> local.properties
+            echo [INFO] Created local.properties with ANDROID_HOME: !ANDROID_HOME_CLEAN!
             set SDK_FOUND=1
         )
     )