diff --git a/scripts/auto_setup.py b/scripts/auto_setup.py
index bf716e6c..9d150156 100644
--- a/scripts/auto_setup.py
+++ b/scripts/auto_setup.py
@@ -120,10 +120,10 @@ BASE_MENUS = {
     'Configure System': (
       MenuEntry('Configure Browsers',       'auto_config_browsers'),
       MenuEntry('Open Shell',               'auto_config_open_shell'),
-      #MenuEntry('Disable Fast Startup',     no_op),
+      MenuEntry('Disable Fast Startup',     'auto_disable_fast_startup', selected=False),
       #MenuEntry('Disable Telemetry',        no_op), # O&O ShutUp 10
       MenuEntry('Enable BSoD MiniDumps',    'auto_enable_bsod_minidumps'),
-      #MenuEntry('Enable Hibernation',       no_op),
+      MenuEntry('Enable Hibernation',       'auto_enable_hibernation', selected=False),
       MenuEntry('Enable RegBack',           'auto_enable_regback'),
       MenuEntry('Enable System Restore',    'auto_system_restore_enable'),
       MenuEntry('Set System Restore Size',  'auto_system_restore_set_size'),
diff --git a/scripts/wk/setup/win.py b/scripts/wk/setup/win.py
index 736836f2..9bf2bda2 100644
--- a/scripts/wk/setup/win.py
+++ b/scripts/wk/setup/win.py
@@ -388,11 +388,22 @@ def load_preset(menus, presets, title, enable_menu_exit=True):
   print_standard(f'{title}')
   print('')
   if selection[0] == 'Default':
+    # LibreOffice
     if ask('Install LibreOffice?'):
       menus['Install Software'].options['LibreOffice']['Selected'] = True
+
+    # Hiberboot & Hibernation
+    print('')
+    msg = 'Disable Fast Startup and enable Hibernation? (Recommended for SSDs)'
+    if ask(msg):
+      for option in ('Disable Fast Startup', 'Enable Hibernation'):
+        menus['Configure System'].options[option]['Selected'] = True
+
+    # ESET NOD32 AV
+    print('')
     if ask('Install ESET NOD32 AV?'):
       option = 'ESET NOD32 AV'
-      if ask('     Use MSP settings?'):
+      if ask('          For ITS/VIP?'):
         option = f'{option} (MSP)'
       menus['Install Software'].options[option]['Selected'] = True
 
@@ -532,11 +543,27 @@ def auto_set_custom_power_plan():
   TRY_PRINT.run('Set Custom Power Plan...', create_custom_power_plan)
 
 
+def auto_disable_fast_startup():
+  """Disable fast startup (i.e. Hiberboot)."""
+  TRY_PRINT.run(
+    'Disable Fast Startup...', reg_set_value, 'HKLM',
+    r'SOFTWARE\Policies\Microsoft\Windows\System',
+    'HiberbootEnabled', 0, 'DWORD',
+    )
+
+
 def auto_enable_bsod_minidumps():
   """Enable saving minidumps during BSoDs."""
   TRY_PRINT.run('Enable BSoD mini dumps...', enable_bsod_minidumps)
 
 
+def auto_enable_hibernation():
+  """Enable Hibernation."""
+  TRY_PRINT.run(
+    'Enable Hibernation...', run_program, ['powercfg', '/hibernate', 'on'],
+    )
+
+
 def auto_enable_regback():
   """Enable RegBack."""
   TRY_PRINT.run(