diff --git a/devlib/target.py b/devlib/target.py
index 48f7b1b4b..1e36023ec 100644
--- a/devlib/target.py
+++ b/devlib/target.py
@@ -1381,7 +1381,7 @@ def homescreen(self):
 
     def _resolve_paths(self):
         if self.working_directory is None:
-            self.working_directory = '/data/local/tmp/devlib-target'
+            self.working_directory = self.path.join(self.external_storage, 'devlib-target')
         self._file_transfer_cache = self.path.join(self.working_directory, '.file-cache')
         if self.executables_directory is None:
             self.executables_directory = '/data/local/tmp/bin'