diff --git a/src/playbook/Configuration/atlas/appx.yml b/src/playbook/Configuration/atlas/appx.yml
index 200b213995..3264b5e528 100644
--- a/src/playbook/Configuration/atlas/appx.yml
+++ b/src/playbook/Configuration/atlas/appx.yml
@@ -82,9 +82,8 @@ actions:
   - !appx: {name: '*Global.IrisService*', type: app, unregister: true}
   - !appx: {name: '*Global.ValueBanner*', type: app, unregister: true}
 
-  - !run:
-    exe: 'powershell.exe'
-    args: '-NoP -File CLIENTCBS.ps1'
+  - !powerShell: 
+    command: '& """CLIENTCBS.ps1"""'
     exeDir: true
 
   # Family App, Quick Assist
diff --git a/src/playbook/Configuration/atlas/components.yml b/src/playbook/Configuration/atlas/components.yml
index be43c4e61e..49ddd3d0d4 100644
--- a/src/playbook/Configuration/atlas/components.yml
+++ b/src/playbook/Configuration/atlas/components.yml
@@ -16,8 +16,8 @@ actions:
 
     # Microsoft Edge
   - !writeStatus: {status: 'Removing Microsoft Edge', option: 'uninstall-edge'}
-  - !cmd:
-    command: 'powershell.exe -NoP -EP Unrestricted -File "%windir%\AtlasDesktop\1. Software\Remove Edge.ps1" -UninstallEdge -KeepAppX -Exit'
+  - !powerShell: 
+    command: '& """$env:windir\AtlasDesktop\1. Software\Remove Edge.ps1""" -UninstallEdge -KeepAppX -Exit'
     wait: true
     runas: currentUserElevated
     option: 'uninstall-edge'
@@ -35,13 +35,11 @@ actions:
   - !run: {exeDir: true, exe: 'ONED.cmd'}
 
   - !writeStatus: {status: 'Removing components'}
-  - !run:
-    exe: 'powershell'
-    args: '& """$env:windir\AtlasModules\PackagesEnvironment\centralScript.ps1""" -PlaybookInstall'
+  - !powerShell: 
+    command: '& """$env:windir\AtlasModules\PackagesEnvironment\centralScript.ps1""" -PlaybookInstall'
     option: 'defender-disable'
-  - !run:
-    exe: 'powershell'
-    args: '& """$env:windir\AtlasModules\PackagesEnvironment\centralScript.ps1""" -PlaybookInstall -EverythingButDefender'
+  - !powerShell: 
+    command: '& """$env:windir\AtlasModules\PackagesEnvironment\centralScript.ps1""" -PlaybookInstall -EverythingButDefender'
     option: 'defender-enable'
 
     # Update Health Tools
diff --git a/src/playbook/Configuration/atlas/services.yml b/src/playbook/Configuration/atlas/services.yml
index df544069b1..0776676e94 100644
--- a/src/playbook/Configuration/atlas/services.yml
+++ b/src/playbook/Configuration/atlas/services.yml
@@ -6,9 +6,8 @@ actions:
   - !writeStatus: {status: 'Configuring services'}
 
   # Backup default Windows serivces & drivers
-  - !cmd:
-    command: 'powershell -NoP -EP Unrestricted -File "BACKUP.ps1" "%windir%\AtlasModules\Other\winServices.reg"'
-    wait: true
+  - !powerShell: 
+    command: '& """BACKUP.ps1""" """$env:windir\AtlasModules\Other\winServices.reg"""'
     exeDir: true
 
   # ------------------------ Services ------------------------
diff --git a/src/playbook/Configuration/atlas/start.yml b/src/playbook/Configuration/atlas/start.yml
index 00bc61a769..660315a4d3 100644
--- a/src/playbook/Configuration/atlas/start.yml
+++ b/src/playbook/Configuration/atlas/start.yml
@@ -47,32 +47,28 @@ actions:
   ################ NO LOCAL BUILD ################
 
   - !writeStatus: {status: 'Installing software'}
-  - !run:
-    exe: 'powershell.exe'
-    args: '-NoP -File "SOFTWARE.ps1"'
+  - !powerShell:
+    command: '& """SOFTWARE.ps1"""'
     exeDir: true
     weight: 150
     runas: currentUserElevated
   - !writeStatus: {status: 'Installing Google Chrome', option: 'browser-chrome'}
-  - !run:
-    exe: 'powershell.exe'
-    args: '-NoP -File "SOFTWARE.ps1" -Chrome'
+  - !powerShell:
+    command: '& """SOFTWARE.ps1""" -Chrome'
     exeDir: true
     weight: 150
     option: 'browser-chrome'
     runas: currentUserElevated
   - !writeStatus: {status: 'Installing Brave', option: 'browser-brave'}
-  - !run:
-    exe: 'powershell.exe'
-    args: '-NoP -File "SOFTWARE.ps1" -Brave'
+  - !powerShell:
+    command: '& """SOFTWARE.ps1"" -Brave'
     exeDir: true
     weight: 150
     option: 'browser-brave'
     runas: currentUserElevated
   - !writeStatus: {status: 'Installing Waterfox', option: 'browser-waterfox'}
-  - !run:
-    exe: 'powershell.exe'
-    args: '-NoP -File "SOFTWARE.ps1" -Waterfox'
+  - !powerShell:
+    command: '& """SOFTWARE.ps1""" -Waterfox'
     exeDir: true
     weight: 150
     option: 'browser-waterfox'
diff --git a/src/playbook/Configuration/tweaks/misc/create-shortcuts.yml b/src/playbook/Configuration/tweaks/misc/create-shortcuts.yml
index 7a2e84a934..54e71ee3d8 100644
--- a/src/playbook/Configuration/tweaks/misc/create-shortcuts.yml
+++ b/src/playbook/Configuration/tweaks/misc/create-shortcuts.yml
@@ -3,7 +3,6 @@ title: Create Shortcuts
 description: Creates shortcuts for the desktop and more
 privilege: TrustedInstaller
 actions:
-  - !run:
-    exe: 'powershell.exe'
-    args: '-NoP -EP Unrestricted -File "SHORTCUTS.ps1"'
+  - !powerShell: 
+    command: '& """SHORTCUTS.ps1"""'
     exeDir: true
diff --git a/src/playbook/Configuration/tweaks/qol/appearance/atlas-theme.yml b/src/playbook/Configuration/tweaks/qol/appearance/atlas-theme.yml
index ea4014486f..9bff3e7c78 100644
--- a/src/playbook/Configuration/tweaks/qol/appearance/atlas-theme.yml
+++ b/src/playbook/Configuration/tweaks/qol/appearance/atlas-theme.yml
@@ -10,9 +10,8 @@ actions:
     wait: true
 
     # Set lockscreen
-  - !run:
-    exe: 'powershell.exe'
-    args: '-NoP -EP Unrestricted & """LOCKSCREEN.ps1"""'
+  - !powerShell: 
+    command: '& """LOCKSCREEN.ps1"""'
     exeDir: true
     runas: currentUserElevated
   - !taskKill: {name: 'SystemSettings', ignoreErrors: true}
diff --git a/src/playbook/Configuration/tweaks/scripts/script-backup2.yml b/src/playbook/Configuration/tweaks/scripts/script-backup2.yml
index 637e897bfb..5f90248f22 100644
--- a/src/playbook/Configuration/tweaks/scripts/script-backup2.yml
+++ b/src/playbook/Configuration/tweaks/scripts/script-backup2.yml
@@ -3,7 +3,6 @@ title: Backup Atlas Services and Drivers
 description: Backs up default Atlas services and drivers, after all the tweaks are finished
 privilege: TrustedInstaller
 actions:
-  - !cmd:
-    command: 'powershell -NoP -EP Unrestricted -File "BACKUP.ps1" "%windir%\AtlasModules\Other\atlasServices.reg"'
-    wait: true
+  - !powerShell: 
+    command: '& """BACKUP.ps1""" """$env:windir\AtlasModules\Other\atlasServices.reg"""'
     exeDir: true
diff --git a/src/playbook/Configuration/tweaks/scripts/script-cleanup.yml b/src/playbook/Configuration/tweaks/scripts/script-cleanup.yml
index d790c23799..e4812cd3ad 100644
--- a/src/playbook/Configuration/tweaks/scripts/script-cleanup.yml
+++ b/src/playbook/Configuration/tweaks/scripts/script-cleanup.yml
@@ -3,8 +3,7 @@ title: Cleanup Temporary Files
 description: Cleans up temporary files using Disk Cleanup (if no other installs of Windows are found)
 privilege: TrustedInstaller
 actions:
-  - !run:
-    exe: 'powershell.exe'
-    args: '-NoP -File CLEANUP.ps1'
+  - !powerShell: 
+    command: '& """CLEANUP.ps1"""'
     exeDir: true
     runas: currentUserElevated
diff --git a/src/playbook/Configuration/tweaks/scripts/script-core-isolation.yml b/src/playbook/Configuration/tweaks/scripts/script-core-isolation.yml
index bdf440aa82..c9ed93b441 100644
--- a/src/playbook/Configuration/tweaks/scripts/script-core-isolation.yml
+++ b/src/playbook/Configuration/tweaks/scripts/script-core-isolation.yml
@@ -4,7 +4,4 @@ description: Disables Core Isolation (VBS) based on the user's options
 privilege: TrustedInstaller
 option: 'vbs-disable'
 actions:
-  - !powerShell:
-    command: '& """$env:windir\AtlasDesktop\7. Security\Core Isolation (VBS)\Current Configuration.ps1""" -DisableAllVBS'
-    exeDir: true
-    wait: true
+  - !powerShell: {command: '& """$env:windir\AtlasDesktop\7. Security\Core Isolation (VBS)\Current Configuration.ps1""" -DisableAllVBS'}
diff --git a/src/playbook/Configuration/tweaks/scripts/script-devices.yml b/src/playbook/Configuration/tweaks/scripts/script-devices.yml
index f073dced1d..bbbc99547f 100644
--- a/src/playbook/Configuration/tweaks/scripts/script-devices.yml
+++ b/src/playbook/Configuration/tweaks/scripts/script-devices.yml
@@ -4,7 +4,6 @@ description: Disables devices that users would not typically need to reduce any
 privilege: TrustedInstaller
 actions:
   - !powerShell: {command: 'Disable-NetAdapterBinding -Name "*" -ComponentID ms_msclient, ms_server, ms_lldp, ms_lltdio, ms_rspndr'}
-  - !run:
-    exe: 'powershell.exe'
-    args: '-NoP -File DISABLEPNP.ps1'
+  - !powerShell: 
+    command: '& """DISABLEPNP.ps1"""'
     exeDir: true
diff --git a/src/playbook/Configuration/tweaks/scripts/script-ngen.yml b/src/playbook/Configuration/tweaks/scripts/script-ngen.yml
index 867abfbc61..86887fc850 100644
--- a/src/playbook/Configuration/tweaks/scripts/script-ngen.yml
+++ b/src/playbook/Configuration/tweaks/scripts/script-ngen.yml
@@ -3,7 +3,6 @@ title: Runs NGEN on PowerShell libraries
 description: Optimizes PowerShell startup time by compiling the .NET libraries
 privilege: TrustedInstaller
 actions:
-  - !run:
-    exe: 'powershell.exe'
-    args: '-NoP -EP Unrestricted -File NGEN.ps1'
+  - !powerShell: 
+    command: '& """NGEN.ps1"""'
     exeDir: true
diff --git a/src/playbook/Configuration/tweaks/scripts/script-pfp.yml b/src/playbook/Configuration/tweaks/scripts/script-pfp.yml
index dabea2a767..af15825df4 100644
--- a/src/playbook/Configuration/tweaks/scripts/script-pfp.yml
+++ b/src/playbook/Configuration/tweaks/scripts/script-pfp.yml
@@ -3,7 +3,6 @@ title: Set Profile Pictures
 description: Sets the default Atlas profile pictures
 privilege: TrustedInstaller
 actions:
-  - !run:
-    exe: 'powershell.exe'
-    args: '-NoP -File "PFP.ps1"'
+  - !powerShell: 
+    command: '& """PFP.ps1"""'
     exeDir: true