diff --git a/optional/install-adk.cmd b/optional/install-adk.cmd
new file mode 100644
index 0000000..63079fb
--- /dev/null
+++ b/optional/install-adk.cmd
@@ -0,0 +1,37 @@
+@echo off
+
+set EXE=..\software\adk-setup.exe
+set OSCDPATH="%ProgramFiles(x86)%\Windows Kits\10\Assessment and Deployment Kit\Deployment Tools\amd64\Oscdimg"
+set STARTMENU=%PROGRAMDATA%\"Microsoft\Windows\Start Menu\Programs"
+
+if NOT EXIST %EXE% (
+  echo ERROR: %EXE% not found!
+  exit /b
+)
+
+echo ####### %0 #######
+echo.
+
+echo installing Microsoft ADK deployment tools ...
+%EXE% /q /ceip off /norestart /features OptionId.DeploymentTools
+
+if NOT EXIST %OSCDPATH%\oscdimg.exe (
+  echo ERROR: cannot find oscdimg.exe!
+  echo INFO: Installation of "Assessment and Deployment Kit (ADK)" failed!
+
+  echo.
+  echo ####### %0 #######
+  exit /b
+)
+
+rem ADK ...
+move /Y %STARTMENU%\"Windows Kits\Windows ADK\Windows System Image Manager.lnk" ^
+  %STARTMENU%\"System Tools\Image Manager.lnk" 2>nul
+rd /S /Q %STARTMENU%\"Windows Kits" 2>nul
+
+rem show oscdimg usage:
+%OSCDPATH%\oscdimg.exe
+
+echo.
+echo ####### %0 #######
+
diff --git a/scripts/autoconfig.cmd b/scripts/autoconfig.cmd
index c05192e..905ba67 100644
--- a/scripts/autoconfig.cmd
+++ b/scripts/autoconfig.cmd
@@ -201,9 +201,6 @@ echo.
 call install-tweaks.cmd
 echo.
 
-call install-adk.cmd
-echo.
-
 call install-git.cmd
 echo.
 
diff --git a/scripts/cleanup-startmenu.cmd b/scripts/cleanup-startmenu.cmd
index 1f51608..317bfc8 100644
--- a/scripts/cleanup-startmenu.cmd
+++ b/scripts/cleanup-startmenu.cmd
@@ -26,11 +26,6 @@ rem VLC ...
 move /Y %STARTMENU%\"VideoLan\VLC media player.lnk" %STARTMENU% 2>nul
 rd /S /Q %STARTMENU%\VideoLan 2>nul
 
-rem ADK ...
-move /Y %STARTMENU%\"Windows Kits\Windows ADK\Windows System Image Manager.lnk" ^
-  %STARTMENU%\"System Tools\Image Manager.lnk" 2>nul
-rd /S /Q %STARTMENU%\"Windows Kits" 2>nul
-
 rem Windows stuff (Character map)...
 move /Y %STARTMENU%\"Accessories\System Tools\Character*.*" ^
   %STARTMENU%\"Accessories" 2>nul
diff --git a/scripts/install-adk.cmd b/scripts/install-adk.cmd
deleted file mode 100644
index 759bf78..0000000
--- a/scripts/install-adk.cmd
+++ /dev/null
@@ -1,16 +0,0 @@
-@echo off
-
-set EXE=..\software\adk-setup.exe
-
-if NOT EXIST %EXE% (
-  echo ERROR: %EXE% not found!
-  exit /b
-)
-
-echo ####### %0 #######
-
-echo installing Microsoft ADK deployment tools ...
-%EXE% /q /ceip off /norestart /features OptionId.DeploymentTools
-
-echo ####### %0 #######
-