diff --git a/src/playbook/Configuration/tweaks.yml b/src/playbook/Configuration/tweaks.yml
index ac45c408a6..359cc4a61b 100644
--- a/src/playbook/Configuration/tweaks.yml
+++ b/src/playbook/Configuration/tweaks.yml
@@ -242,7 +242,7 @@ tasks:
   #  qol\shell                                                                 #
   # -------------------------------------------------------------------------- #
   - tweaks\qol\shell\alt-tab-open-windows.yml
-  - tweaks\qol\shell\config-autorun-autoplay.yml
+  - tweaks\qol\shell\config-autorun.yml
   - tweaks\qol\shell\disable-aero-shake.yml
   - tweaks\qol\shell\disable-low-disk-warning.yml
   - tweaks\qol\shell\disable-menu-delay.yml
diff --git a/src/playbook/Configuration/tweaks/qol/set-hidden-settings-pages.yml b/src/playbook/Configuration/tweaks/qol/set-hidden-settings-pages.yml
index 1fa094ef60..048b17b5c7 100644
--- a/src/playbook/Configuration/tweaks/qol/set-hidden-settings-pages.yml
+++ b/src/playbook/Configuration/tweaks/qol/set-hidden-settings-pages.yml
@@ -8,7 +8,7 @@ actions:
   - !registryValue:
     path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer'
     value: 'SettingsPageVisibility'
-    data: 'hide:recovery;autoplay;usb;maps;maps-downloadmaps;findmydevice;privacy;privacy-speechtyping;privacy-speech;privacy-feedback;privacy-activityhistory;search-permissions;privacy-location;privacy-general;sync;cortana-windowssearch;mobile-devices;mobile-devices-addphone;workplace;backup'
+    data: 'hide:recovery;maps;maps-downloadmaps;findmydevice;privacy;privacy-speechtyping;privacy-speech;privacy-feedback;privacy-activityhistory;search-permissions;privacy-location;privacy-general;sync;cortana-windowssearch;mobile-devices;mobile-devices-addphone;workplace;backup'
     type: REG_SZ
     builds: [ '<22000' ]
 
@@ -16,6 +16,6 @@ actions:
   - !registryValue:
     path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer'
     value: 'SettingsPageVisibility'
-    data: 'hide:recovery;autoplay;usb;maps;maps-downloadmaps;findmydevice;privacy;privacy-feedback;privacy-activityhistory;search-permissions;privacy-location;privacy-general;sync;cortana-windowssearch;mobile-devices;mobile-devices-addphone;workplace;family-group;deviceusage;home'
+    data: 'hide:recovery;maps;maps-downloadmaps;findmydevice;privacy;privacy-feedback;privacy-activityhistory;search-permissions;privacy-location;privacy-general;sync;cortana-windowssearch;mobile-devices;mobile-devices-addphone;workplace;family-group;deviceusage;home'
     type: REG_SZ
     builds: [ '>=22000' ]
diff --git a/src/playbook/Configuration/tweaks/qol/shell/config-autorun-autoplay.yml b/src/playbook/Configuration/tweaks/qol/shell/config-autorun-autoplay.yml
deleted file mode 100644
index 04fa9be1c2..0000000000
--- a/src/playbook/Configuration/tweaks/qol/shell/config-autorun-autoplay.yml
+++ /dev/null
@@ -1,24 +0,0 @@
----
-title: Disable AutoRun/AutoPlay
-description: Disables AutoRun/AutoPlay for the optimal security and usability/QoL
-actions:
-  - !registryValue:
-    path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer'
-    value: 'NoAutorun'
-    data: '1'
-    type: REG_DWORD
-  - !registryValue:
-    path: 'HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers'
-    value: 'DisableAutoplay'
-    data: '1'
-    type: REG_DWORD
-  - !registryValue:
-    path: 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer'
-    value: 'NoDriveTypeAutoRun'
-    data: '255'
-    type: REG_DWORD
-  - !registryValue:
-    path: 'HKLM\SOFTWARE\Policies\Microsoft\Windows\Explorer'
-    value: 'NoAutoplayfornonVolume'
-    data: '1'
-    type: REG_DWORD
diff --git a/src/playbook/Configuration/tweaks/qol/shell/config-autorun.yml b/src/playbook/Configuration/tweaks/qol/shell/config-autorun.yml
new file mode 100644
index 0000000000..66d9c506d0
--- /dev/null
+++ b/src/playbook/Configuration/tweaks/qol/shell/config-autorun.yml
@@ -0,0 +1,30 @@
+---
+title: Disable AutoRun
+description: Disables AutoRun, also known as AutoPlay, for optimal security
+actions:
+  - !registryValue:
+    path: 'HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers'
+    value: 'DisableAutoplay'
+    data: '1'
+    type: REG_DWORD
+  - !registryValue:
+    path: 'HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\EventHandlersDefaultSelection\CameraAlternate'
+    value: 'MSTakeNoAction'
+    data: ''
+    type: REG_NONE
+  - !registryValue:
+    path: 'HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\EventHandlersDefaultSelection\StorageOnArrival'
+    value: 'MSTakeNoAction'
+    data: ''
+    type: REG_NONE
+  - !registryValue:
+    path: 'HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\UserChosenExecuteHandlers\CameraAlternate\ShowPicturesOnArrival'
+    value: 'MSTakeNoAction'
+    data: ''
+    type: REG_NONE
+  - !registryValue:
+    path: 'HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\AutoplayHandlers\UserChosenExecuteHandlers\StorageOnArrival'
+    value: 'MSTakeNoAction'
+    data: ''
+    type: REG_NONE
+
diff --git a/src/playbook/Executables/AtlasDesktop/3. General Configuration/AutoPlay/Disable AutoPlay (default).reg b/src/playbook/Executables/AtlasDesktop/3. General Configuration/AutoPlay/Disable AutoPlay (default).reg
deleted file mode 100644
index ef4f2e3056..0000000000
Binary files a/src/playbook/Executables/AtlasDesktop/3. General Configuration/AutoPlay/Disable AutoPlay (default).reg and /dev/null differ
diff --git a/src/playbook/Executables/AtlasDesktop/3. General Configuration/AutoPlay/Enable AutoPlay.reg b/src/playbook/Executables/AtlasDesktop/3. General Configuration/AutoPlay/Enable AutoPlay.reg
deleted file mode 100644
index b6f69837ed..0000000000
Binary files a/src/playbook/Executables/AtlasDesktop/3. General Configuration/AutoPlay/Enable AutoPlay.reg and /dev/null differ