diff --git a/src/playbook/Configuration/custom.yml b/src/playbook/Configuration/custom.yml
index dc88b421ee..a1e9f6cb2e 100644
--- a/src/playbook/Configuration/custom.yml
+++ b/src/playbook/Configuration/custom.yml
@@ -6,7 +6,6 @@ actions:
   - !writeStatus: {status: 'Preparing hives'}
   - !powerShell:
     command: |
-      net user defaultuser0 /delete *>$null
       $profileList = Get-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList' -Name 'ProfilesDirectory', 'Default' -EA 0
       $usersPath = if ([string]::IsNullOrEmpty($profileList.ProfilesDirectory)) { """$env:SystemDrive\Users""" } else { $profileList.ProfilesDirectory }
       $defaultPath = if ([string]::IsNullOrEmpty($profileList.Default)) { """$usersPath\Default""" } else { $profileList.Default }
diff --git a/src/playbook/Configuration/tweaks/qol/explorer/disable-network-navigation-pane.yml b/src/playbook/Configuration/tweaks/qol/explorer/disable-network-navigation-pane.yml
index 926d6b24ab..5d636bbb7a 100644
--- a/src/playbook/Configuration/tweaks/qol/explorer/disable-network-navigation-pane.yml
+++ b/src/playbook/Configuration/tweaks/qol/explorer/disable-network-navigation-pane.yml
@@ -2,8 +2,14 @@
 title: Disable Network Navigation Pane in Explorer
 description: Disables the network navigation pane/item in the Explorer sidebar for QoL by default, as it is mostly unused
 actions:
-  - !registryValue:
-    path: 'HKCU\SOFTWARE\Classes\CLSID\{F02C1A0D-BE21-4350-88B0-7367FC96EF3C}'
-    value: 'System.IsPinnedToNameSpaceTree'
-    data: '0'
-    type: REG_DWORD
+    # Use this instead once AME fixes hives issue
+  # - !registryValue:
+  #   path: 'HKCU\SOFTWARE\Classes\CLSID\{F02C1A0D-BE21-4350-88B0-7367FC96EF3C}'
+  #   value: 'System.IsPinnedToNameSpaceTree'
+  #   data: '0'
+  #   type: REG_DWORD
+  - !cmd:
+    command: 'reg import "AtlasDesktop\3. General Configuration\File Sharing\Network Navigation Pane\Disable Network Navigation Pane (default).reg"'
+    exeDir: true
+    wait: true
+    runas: currentUserElevated
diff --git a/src/playbook/Configuration/tweaks/qol/shell/restore-old-context-menu.yml b/src/playbook/Configuration/tweaks/qol/shell/restore-old-context-menu.yml
index 35577e90c4..a71502d70e 100644
--- a/src/playbook/Configuration/tweaks/qol/shell/restore-old-context-menu.yml
+++ b/src/playbook/Configuration/tweaks/qol/shell/restore-old-context-menu.yml
@@ -3,8 +3,14 @@ title: Restore Old Context Menu
 description: Restores the old context menu in Windows 11
 builds: [ '>=22000' ]
 actions:
-  - !registryValue:
-    path: 'HKCU\Software\Classes\CLSID\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}\InprocServer32'
-    value: ''
-    data: ''
-    type: REG_SZ
+    # Use this instead once AME fixes hives issue
+  # - !registryValue:
+  #   path: 'HKCU\Software\Classes\CLSID\{86ca1aa0-34aa-4e8b-a509-50c905bae2a2}\InprocServer32'
+  #   value: ''
+  #   data: ''
+  #   type: REG_SZ
+  - !cmd:
+    command: 'reg import "AtlasDesktop\4. Interface Tweaks\Context Menus\Windows 11\Old Context Menu (default).reg"'
+    exeDir: true
+    wait: true
+    runas: currentUserElevated
diff --git a/src/playbook/Executables/AtlasModules/Scripts/ScriptWrappers/DisableFileSharing.ps1 b/src/playbook/Executables/AtlasModules/Scripts/ScriptWrappers/DisableFileSharing.ps1
index e2788acde8..2ee41fd3ea 100644
--- a/src/playbook/Executables/AtlasModules/Scripts/ScriptWrappers/DisableFileSharing.ps1
+++ b/src/playbook/Executables/AtlasModules/Scripts/ScriptWrappers/DisableFileSharing.ps1
@@ -19,6 +19,7 @@ foreach ($interface in $interfaces) {
 sc.exe config NetBT start=disabled | Out-Null
 
 # Set network profile to 'Public Network'
+Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory Public
 $profiles = Get-ChildItem "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\NetworkList\Profiles" -Recurse | Where-Object { $_.GetValue("Category") -ne $null }
 foreach ($profile in $profiles) {
     Set-ItemProperty -Path $profile.PSPath -Name "Category" -Value 0 | Out-Null
diff --git a/src/playbook/Executables/AtlasModules/Scripts/ScriptWrappers/EnableFileSharing.ps1 b/src/playbook/Executables/AtlasModules/Scripts/ScriptWrappers/EnableFileSharing.ps1
index 05d30a04f3..a916b2b503 100644
--- a/src/playbook/Executables/AtlasModules/Scripts/ScriptWrappers/EnableFileSharing.ps1
+++ b/src/playbook/Executables/AtlasModules/Scripts/ScriptWrappers/EnableFileSharing.ps1
@@ -20,10 +20,7 @@ sc.exe config NetBT start=system | Out-Null
 choice /c:yn /n /m "Would you like to change your network profile to 'Private'? [Y/N] "
 if ($LASTEXITCODE -eq 1) {
     # Set network profile to 'Private Network'
-    $profiles = Get-ChildItem "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\NetworkList\Profiles" -Recurse | Where-Object { $_.GetValue("Category") -ne $null }
-    foreach ($profile in $profiles) {
-        Set-ItemProperty -Path $profile.PSPath -Name "Category" -Value 1 | Out-Null
-    }
+    Get-NetConnectionProfile | Set-NetConnectionProfile -NetworkCategory Private
 
     # Disable network discovery firewall rules
     Get-NetFirewallRule | Where-Object {