diff --git a/builder/main.py b/builder/main.py
index 6ac6086..d34c935 100644
--- a/builder/main.py
+++ b/builder/main.py
@@ -154,9 +154,9 @@ if upload_protocol == "mbed":
     ]
 elif upload_protocol == "picotool":
     env.Replace(
-        UPLOADER="rp2040load",
+        UPLOADER=join(platform.get_package_dir("tool-rp2040tools") or "", "rp2040load"),
         UPLOADERFLAGS=["-v", "-D"],
-        UPLOADCMD="$UPLOADER $UPLOADERFLAGS $SOURCES"
+        UPLOADCMD='"$UPLOADER" $UPLOADERFLAGS $SOURCES'
     )
 
     upload_actions = [