diff --git a/src/playbook/Configuration/atlas/start.yml b/src/playbook/Configuration/atlas/start.yml
index e4116999ef..3ee7b65310 100644
--- a/src/playbook/Configuration/atlas/start.yml
+++ b/src/playbook/Configuration/atlas/start.yml
@@ -42,6 +42,9 @@ actions:
   - !writeStatus: {status: 'Disabling Steps Recorder'}
   - !run: {exe: 'DISM.exe', args: '/Online /Remove-Capability /CapabilityName:"App.StepsRecorder~~~~0.0.1.0" /NoRestart', weight: 30}
 
+  - !writeStatus: {status: 'Cleaning the component store'}
+  - !run: {exe: 'DISM.exe', args: '/Online /Cleanup-Image /StartComponentCleanup', weight: 50}
+
     # Initial software
     # 7-Zip, Visual C++ Runtimes, DirectX
   - !writeStatus: {status: 'Installing utilities'}
diff --git a/src/playbook/Executables/CLEANUP.ps1 b/src/playbook/Executables/CLEANUP.ps1
index b22a53c8cf..de4d2da7fb 100644
--- a/src/playbook/Executables/CLEANUP.ps1
+++ b/src/playbook/Executables/CLEANUP.ps1
@@ -23,7 +23,7 @@ function Invoke-AtlasDiskCleanup {
 		"System error minidump files" = 2
 		"Temporary Files" = 0
 		"Thumbnail Cache" = 2
-		"Update Cleanup" = 2
+		"Update Cleanup" = 0
 		"User file versions" = 2
 		"Windows Error Reporting Files" = 2
 		"Windows Defender" = 2