diff --git a/tools/leoupdate b/tools/leoupdate
index 4ed5348..8f43b8d 100755
--- a/tools/leoupdate
+++ b/tools/leoupdate
@@ -6,7 +6,7 @@
 
 cd "$LOC"/temp
 echo "extract update.zip"
-unzip -o -qq  "$LOC"/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$LOGNAME.zip
+unzip -o -qq  "$LOC"/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$USER.zip
 
 echo "Making Leo Compatible Update script"
 cd "$LOC"
@@ -22,8 +22,8 @@
 rm -rf "$LOC"/temp/boot.img
 rm -rf "$LOC"/temp/boot
 cp -a "$LOC"/boot "$LOC"/temp/boot
-rm -rf "$LOC"/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$LOGNAME.zip
-zip -9yr "$LOC"/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$LOGNAME.zip * > /dev/null
+rm -rf "$LOC"/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$USER.zip
+zip -9yr "$LOC"/$TARGET_PRODUCT-ota-$TARGET_BUILD_VARIANT.$USER.zip * > /dev/null
 cd "$LOC"
 
 echo Cleanup...