diff --git a/src/playbook/Configuration/atlas/services.yml b/src/playbook/Configuration/atlas/services.yml
index ff24066556..1a96296059 100644
--- a/src/playbook/Configuration/atlas/services.yml
+++ b/src/playbook/Configuration/atlas/services.yml
@@ -57,8 +57,6 @@ actions:
   - !service: {name: 'IpxlatCfgSvc', operation: change, startup: 4}
   # KeyIso 4 < causes issues with NVCleanstall's driver telemetry tweak
   - !service: {name: 'KtmRm', operation: change, startup: 4}
-  - !service: {name: 'LanmanServer', operation: change, startup: 4}
-  - !service: {name: 'LanmanWorkstation', operation: change, startup: 4}
   - !service: {name: 'lmhosts', operation: change, startup: 4}
   - !service: {name: 'luafv', operation: change, startup: 4}
   - !service: {name: 'MSDTC', operation: change, startup: 4}
@@ -136,18 +134,15 @@ actions:
   # FileInfo 4 < breaks installing Microsoft Store applications to different disk (now disabled via store script)
   # FileCrypt 4 < Breaks installing Microsoft Store applications to different disk (now disabled via store script)
   - !service: {name: 'GpuEnergyDrv', operation: change, startup: 4}
-  - !service: {name: 'KSecPkg', operation: change, startup: 4}
-  - !service: {name: 'mrxsmb', operation: change, startup: 4}
-  - !service: {name: 'mrxsmb20', operation: change, startup: 4}
   # NdisVirtualBus 4 < breaks network bridges
   - !service: {name: 'nvraid', operation: change, startup: 4}
   # PEAUTH 4 < breaks UWP streaming applications such as netflix, manual mode does not fix
   # Set rdbss to manual instead of disabling (fixes WSL), thanks Phlegm
-  - !service: {name: 'rdbss', operation: change, startup: 3}
+  # Commented as we're not sure if it functions normally set to manual
+  # - !service: {name: 'rdbss', operation: change, startup: 3}
   - !service: {name: 'sfloppy', operation: change, startup: 4}
   - !service: {name: 'SiSRaid2', operation: change, startup: 4}
   - !service: {name: 'SiSRaid4', operation: change, startup: 4}
-  - !service: {name: 'srv2', operation: change, startup: 4}
   - !service: {name: 'tcpipreg', operation: change, startup: 4}
   - !service: {name: 'Telemetry', operation: change, startup: 4}
   - !service: {name: 'udfs', operation: change, startup: 4}
diff --git a/src/playbook/Configuration/atlas/start.yml b/src/playbook/Configuration/atlas/start.yml
index b95660b978..b940385b3c 100644
--- a/src/playbook/Configuration/atlas/start.yml
+++ b/src/playbook/Configuration/atlas/start.yml
@@ -1,4 +1,4 @@
----
+ ---
 title: Copy
 description: Copies Atlas folders/files and performs the preliminary configuration
 privilege: TrustedInstaller
@@ -71,7 +71,6 @@ actions:
   - !cmd: {command: 'DISM /Online /Disable-Feature /FeatureName:"Printing-Foundation-InternetPrinting-Client" /NoRestart', weight: 30}
   - !cmd: {command: 'DISM /Online /Disable-Feature /FeatureName:"Printing-XPSServices-Features" /NoRestart', weight: 30}
   - !cmd: {command: 'DISM /Online /Disable-Feature /FeatureName:"MSRDC-Infrastructure" /NoRestart', weight: 30}
-  - !cmd: {command: 'DISM /Online /Disable-Feature /FeatureName:"SmbDirect" /NoRestart', weight: 30}
   - !cmd: {command: 'DISM /Online /Disable-Feature /FeatureName:"Windows-Defender-Default-Definitions" /NoRestart', weight: 30}
   - !cmd: {command: 'DISM /Online /Disable-Feature /FeatureName:"WorkFolders-Client" /NoRestart', weight: 30}
 
diff --git a/src/playbook/Executables/Atlas/3. Configuration/1. General Configuration/Lanman Workstation (SMB)/Disable Lanman Workstation (default).cmd b/src/playbook/Executables/Atlas/3. Configuration/1. General Configuration/Lanman Workstation (SMB)/Disable Lanman Workstation (default).cmd
index 82f0b8b369..6b54a4b4a6 100644
--- a/src/playbook/Executables/Atlas/3. Configuration/1. General Configuration/Lanman Workstation (SMB)/Disable Lanman Workstation (default).cmd	
+++ b/src/playbook/Executables/Atlas/3. Configuration/1. General Configuration/Lanman Workstation (SMB)/Disable Lanman Workstation (default).cmd	
@@ -7,6 +7,7 @@ whoami /user | find /i "S-1-5-18" > nul 2>&1 || (
 )
 
 call setSvc.cmd KSecPkg 4
+call setSvc.cmd LanmanServer 4
 call setSvc.cmd LanmanWorkstation 4
 call setSvc.cmd mrxsmb 4
 call setSvc.cmd mrxsmb20 4
diff --git a/src/playbook/Executables/Atlas/3. Configuration/1. General Configuration/Lanman Workstation (SMB)/Enable Lanman Workstation.cmd b/src/playbook/Executables/Atlas/3. Configuration/1. General Configuration/Lanman Workstation (SMB)/Enable Lanman Workstation.cmd
index 9878eb6473..b7842e008e 100644
--- a/src/playbook/Executables/Atlas/3. Configuration/1. General Configuration/Lanman Workstation (SMB)/Enable Lanman Workstation.cmd	
+++ b/src/playbook/Executables/Atlas/3. Configuration/1. General Configuration/Lanman Workstation (SMB)/Enable Lanman Workstation.cmd	
@@ -7,6 +7,7 @@ whoami /user | find /i "S-1-5-18" > nul 2>&1 || (
 )
 
 call setSvc.cmd KSecPkg 0
+call setSvc.cmd LanmanServer 2
 call setSvc.cmd LanmanWorkstation 2
 call setSvc.cmd mrxsmb 3
 call setSvc.cmd mrxsmb20 3