diff --git a/image/autounattend_BIOS_template.xml b/image/autounattend_BIOS_template.xml
index 6889420..6c51d95 100644
--- a/image/autounattend_BIOS_template.xml
+++ b/image/autounattend_BIOS_template.xml
@@ -62,7 +62,8 @@
             </ImageInstall>
             <UserData>
                 <ProductKey>
-                    <Key>VK7JG-NPHTM-C97JM-9MPGT-3V66T</Key>
+                    <Key>M7XTQ-FN8P6-TTKYV-9D4CC-J462D</Key>
+                    <WillShowUI>OnError</WillShowUI>
                 </ProductKey>
                 <AcceptEula>true</AcceptEula>
                 <Organization>none</Organization>
@@ -79,12 +80,9 @@
             <RegisteredOrganization>none</RegisteredOrganization>
             <RegisteredOwner>none</RegisteredOwner>
             <TimeZone>Central Europe Standard Time</TimeZone>
-            <ProductKey>VK7JG-NPHTM-C97JM-9MPGT-3V66T</ProductKey>
+            <ProductKey>M7XTQ-FN8P6-TTKYV-9D4CC-J462D</ProductKey>
             <ShowPowerButtonOnStartScreen>true</ShowPowerButtonOnStartScreen>
         </component>
-        <component name="Microsoft-Windows-SQMApi" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-            <CEIPEnabled>0</CEIPEnabled>
-        </component>
     </settings>
     <settings pass="oobeSystem">
         <component name="Microsoft-Windows-International-Core" processorArchitecture="amd64" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@@ -142,5 +140,5 @@
             <EnableLUA>false</EnableLUA>
         </component>
     </settings>
-    <cpi:offlineImage cpi:source="wim:c:/temp/w10/sources/install.wim#Windows 10 Pro" xmlns:cpi="urn:schemas-microsoft-com:cpi" />
+    <cpi:offlineImage cpi:source="wim:c:/temp/install.wim#Windows 10 Enterprise LTSC 2021 Evaluation" xmlns:cpi="urn:schemas-microsoft-com:cpi" />
 </unattend>
diff --git a/scripts/copy-executables.cmd b/scripts/copy-executables.cmd
index 233de77..3285481 100644
--- a/scripts/copy-executables.cmd
+++ b/scripts/copy-executables.cmd
@@ -9,13 +9,11 @@ echo ####### %0 #######
 for %%E in (
 
   bfg.jar  
-  MediaCreationTool20H2.exe
   putty.exe
   puttygen.exe
   rufus.exe
   snapcontrol.exe
   snapshot64.exe
-  Windows-ISO-Downloader.exe
   tzedit.exe
 
 ) do (
diff --git a/scripts/startmenu/Media Creation Tool (20H2).lnk b/scripts/startmenu/Media Creation Tool (20H2).lnk
deleted file mode 100644
index 78f12c5..0000000
Binary files a/scripts/startmenu/Media Creation Tool (20H2).lnk and /dev/null differ
diff --git a/scripts/startmenu/Windows ISO Downloader.lnk b/scripts/startmenu/Windows ISO Downloader.lnk
deleted file mode 100644
index 739e374..0000000
Binary files a/scripts/startmenu/Windows ISO Downloader.lnk and /dev/null differ
diff --git a/software/basic.csv b/software/basic.csv
index 0c142cf..a1a6271 100644
--- a/software/basic.csv
+++ b/software/basic.csv
@@ -17,7 +17,6 @@ https://netcologne.dl.sourceforge.net/project/gnuwin32/wget/1.11.4-1/wget-1.11.4
 https://netcologne.dl.sourceforge.net/project/gnuwin32/wget/1.11.4-1/wget-1.11.4-1-dep.zip wgetdeps.zip
 https://github.com/git-for-windows/git/releases/download/v2.30.1.windows.1/Git-2.30.1-64-bit.exe git-setup.exe
 http://www.ardiehl.de/imapcopy/IMAPCopy.zip imapcopy.zip
-https://go.microsoft.com/fwlink/?LinkId=691209 MediaCreationTool20H2.exe
 https://www.nirsoft.net/utils/offlineregistryfinder-x64.zip offlineregistryfinder.zip
 https://github.com/Open-Shell/Open-Shell-Menu/releases/download/v4.4.160/OpenShellSetup_4_4_160.exe openshell-setup.exe
 https://the.earth.li/~sgtatham/putty/0.76/w64/puttygen.exe puttygen.exe
@@ -36,7 +35,6 @@ http://www.drivesnapshot.de/download/snapshot64.exe snapshot64.exe
 https://github.com/Superfly-Inc/ShowKeyPlus/releases/download/ShowKeyPlus1.1.16.0/ShowKeyPlus1.1.16.0_x64.zip showkeyplus.zip
 https://win32diskimager.org/wp-content/uploads/win32diskimager-1.0.0-install.exe win32diskimager.exe
 https://ftp.halifax.rwth-aachen.de/videolan/vlc/3.0.12/win64/vlc-3.0.12-win64.exe vlc-setup.exe
-https://www.heidoc.net/php/Windows-ISO-Downloader.exe Windows-ISO-Downloader.exe
 https://dl.google.com/android/repository/platform-tools_r31.0.3-windows.zip android.zip
 https://www.inveigle.net/downloads/CMail_0.8.3_amd64.zip cmail.zip
 https://github.com/M2Team/NSudo/releases/download/8.2/NSudo_8.2_All_Components.zip nsudo.zip