diff --git a/src/playbook/Executables/AtlasDesktop/6. Advanced Configuration/Services/Printing/Disable Printing.cmd b/src/playbook/Executables/AtlasDesktop/6. Advanced Configuration/Services/Printing/Disable Printing.cmd
index 8231bd4f73..797973724a 100644
--- a/src/playbook/Executables/AtlasDesktop/6. Advanced Configuration/Services/Printing/Disable Printing.cmd	
+++ b/src/playbook/Executables/AtlasDesktop/6. Advanced Configuration/Services/Printing/Disable Printing.cmd	
@@ -59,14 +59,6 @@ call "%windir%\AtlasModules\Scripts\setSvc.cmd" PrintWorkFlowUserSvc 4
 
 call "%windir%\AtlasModules\Scripts\settingsPages.cmd" /hide printers
 
-echo Disabling capabilities...
-for %%a in (
-    "Print.Fax.Scan~~~~0.0.1.0"
-    "Print.Management.Console~~~~0.0.1.0"
-) do (
-    dism /Online /Remove-Capability /CapabilityName:"%%a" /NoRestart > nul
-)
-
 echo Disabling features...
 for %%a in (
     "Printing-Foundation-Features"
diff --git a/src/playbook/Executables/AtlasDesktop/6. Advanced Configuration/Services/Printing/Enable Printing (default).cmd b/src/playbook/Executables/AtlasDesktop/6. Advanced Configuration/Services/Printing/Enable Printing (default).cmd
index abfe68fb87..e6d2f441a8 100644
--- a/src/playbook/Executables/AtlasDesktop/6. Advanced Configuration/Services/Printing/Enable Printing (default).cmd	
+++ b/src/playbook/Executables/AtlasDesktop/6. Advanced Configuration/Services/Printing/Enable Printing (default).cmd	
@@ -59,14 +59,6 @@ call setSvc.cmd PrintWorkFlowUserSvc 3
 
 call "%windir%\AtlasModules\Scripts\settingsPages.cmd" /unhide printers
 
-echo Enabling capabilities (this might take a while)...
-for %%a in (
-    "Print.Fax.Scan~~~~0.0.1.0"
-    "Print.Management.Console~~~~0.0.1.0"
-) do (
-    dism /Online /Add-Capability /CapabilityName:"%%a" /NoRestart > nul
-)
-
 echo Enabling features...
 for %%a in (
     "Printing-Foundation-Features"
@@ -77,8 +69,14 @@ for %%a in (
     dism /Online /Enable-Feature /FeatureName:"%%a" /NoRestart > nul
 )
 
+echo Enabling capabilities (this might take a while)...
+dism /Online /Add-Capability /CapabilityName:"Print.Management.Console~~~~0.0.1.0" /NoRestart > nul
+
 if "%~1"=="/silent" exit /b
 
+choice /c:yn /n /m "Would you want to enable Fax and Scan functionality? [Y/N] "
+if "%errorlevel%"=="1" dism /Online /Add-Capability /CapabilityName:"Print.Fax.Scan~~~~0.0.1.0" /NoRestart > nul
+
 echo]
 echo Finished, please reboot your device for changes to apply.
 pause