diff --git a/src/playbook/Configuration/tweaks/performance/disable-auto-folder-discovery.yml b/src/playbook/Configuration/tweaks/performance/disable-auto-folder-discovery.yml
index de931318bb..fea435c937 100644
--- a/src/playbook/Configuration/tweaks/performance/disable-auto-folder-discovery.yml
+++ b/src/playbook/Configuration/tweaks/performance/disable-auto-folder-discovery.yml
@@ -2,8 +2,14 @@
 title: Disable Automatic Folder Discovery
 description: Improves performance in File Explorer by not automatically determining the folder 'type' (such as pictures) for each folder's content.
 actions:
-  - !registryValue:
-    path: 'HKCU\Software\Classes\Local Settings\Software\Microsoft\Windows\Shell\Bags\AllFolders\Shell'
-    value: 'FolderType'
-    data: 'NotSpecified'
-    type: REG_SZ
+    # Use this instead once AME fixes hives issue
+  # - !registryValue:
+  #   path: 'HKCU\Software\Classes\Local Settings\Software\Microsoft\Windows\Shell\Bags\AllFolders\Shell'
+  #   value: 'FolderType'
+  #   data: 'NotSpecified'
+  #   type: REG_SZ
+  - !cmd:
+    command: 'reg import "AtlasDesktop\4. Interface Tweaks\File Explorer Customization\Automatic Folder Discovery\Disable Automatic Folder Discovery (default).reg"'
+    exeDir: true
+    wait: true
+    runas: currentUserElevated
diff --git a/src/playbook/Configuration/tweaks/qol/explorer/disable-gallery.yml b/src/playbook/Configuration/tweaks/qol/explorer/disable-gallery.yml
index 1d25ff7a66..5042a7c360 100644
--- a/src/playbook/Configuration/tweaks/qol/explorer/disable-gallery.yml
+++ b/src/playbook/Configuration/tweaks/qol/explorer/disable-gallery.yml
@@ -3,8 +3,14 @@ title: Hide Gallery in File Explorer
 description: Hides the new 23H2 'Gallery' in File Explorer for viewing pictures
 builds: [ '>=22000' ]
 actions:
-  - !registryValue:
-    path: 'HKCU\SOFTWARE\Classes\CLSID\{e88865ea-0e1c-4e20-9aa6-edcd0212c87c}'
-    value: 'System.IsPinnedToNameSpaceTree'
-    data: '0'
-    type: REG_DWORD
+    # Use this instead once AME fixes hives issue
+  # - !registryValue:
+  #   path: 'HKCU\SOFTWARE\Classes\CLSID\{e88865ea-0e1c-4e20-9aa6-edcd0212c87c}'
+  #   value: 'System.IsPinnedToNameSpaceTree'
+  #   data: '0'
+  #   type: REG_DWORD
+  - !cmd:
+    command: 'reg import "AtlasDesktop\4. Interface Tweaks\File Explorer Customization\Gallery\Disable Gallery (default).reg"'
+    exeDir: true
+    wait: true
+    runas: currentUserElevated
diff --git a/src/playbook/Executables/AtlasModules/Scripts/newUsers.ps1 b/src/playbook/Executables/AtlasModules/Scripts/newUsers.ps1
index 89759df985..23ef19a40d 100644
--- a/src/playbook/Executables/AtlasModules/Scripts/newUsers.ps1
+++ b/src/playbook/Executables/AtlasModules/Scripts/newUsers.ps1
@@ -31,6 +31,9 @@ Set-LockscreenImage
 # Disable 'Network' in navigation pane
 reg import "$atlasDesktop\3. General Configuration\File Sharing\Network Navigation Pane\Disable Network Navigation Pane (default).reg" *>$null
 
+# Disable Automatic Folder Discovery
+reg import "$atlasDesktop\4. Interface Tweaks\File Explorer Customization\Automatic Folder Discovery\Disable Automatic Folder Discovery (default).reg" *>$null
+
 # Set visual effects
 & "$atlasDesktop\4. Interface Tweaks\Visual Effects (Animations)\Atlas Visual Effects (default).cmd" /silent