diff --git a/.bin/Scripts/Launch.cmd b/.bin/Scripts/Launch.cmd
index 3a3ed6a5..18c304f2 100644
--- a/.bin/Scripts/Launch.cmd
+++ b/.bin/Scripts/Launch.cmd
@@ -163,7 +163,7 @@ rem Prep
 set "args=-aoa -bso0 -bse0 -bsp0 -p%ARCHIVE_PASSWORD%"
 set "config=%L_ITEM%"
 set "dest=%client_dir%\Office\ODT"
-set "odt_exe=%L_PATH%\setup.exe"
+set "odt_exe=setup.exe"
 set "source=%cbin%\_Office.7z"
 
 rem Extract
diff --git a/.bin/Scripts/functions/update.py b/.bin/Scripts/functions/update.py
index c703bf71..07fe6e8f 100644
--- a/.bin/Scripts/functions/update.py
+++ b/.bin/Scripts/functions/update.py
@@ -626,21 +626,21 @@ def update_office():
     shutil.copytree(include_path, dest)
 
   # Download and extract
-  _odt = 'odt.exe'
-  _out_path = r'{}\odt'
+  _out_path = r'{}\odt'.format(global_vars['TmpDir'])
   download_to_temp('odt.exe', SOURCE_URLS['Office Deployment Tool'])
   cmd = [
-    odt,
-    r'/extract:{}\odt'.format(global_vars['TmpDir']),
+    r'{}\odt.exe'.format(global_vars['TmpDir']),
+    r'/extract:{}\odt'.format(_out_path),
     '/quiet',
     ]
   run_program(cmd)
   shutil.move(
-    _out_path,
+    r'{}\setup.exe'.format(_out_path),
     r'{}\_Office'.format(global_vars['CBinDir']))
 
   # Cleanup
-  remove_from_temp(odt.exe)
+  remove_from_temp('odt')
+  remove_from_temp('odt.exe')
 
 
 def update_classic_start_skin():