diff --git a/CHANGELOG.md b/CHANGELOG.md
index 315624d15..d448a77a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,7 +26,7 @@
   - CryptexFixup 1.0.1 - release
   - DebugEnhancer 1.0.7 - release
   - FeatureUnlock 1.1.0 - release
-  - OpenCorePkg 0.8.6 - release
+  - OpenCorePkg 0.8.7 - rolling (5061093)
   - RestrictEvents 1.0.9 - release
   - WhateverGreen 1.6.1 - release
 
diff --git a/payloads/Config/config.plist b/payloads/Config/config.plist
index 4119e1f94..e9a82e4ff 100644
--- a/payloads/Config/config.plist
+++ b/payloads/Config/config.plist
@@ -1994,7 +1994,7 @@
 			<key>PollAppleHotKeys</key>
 			<true/>
 			<key>ShowPicker</key>
-			<true/>
+			<string>SkipOnHibernateWake</string>
 			<key>TakeoffDelay</key>
 			<integer>0</integer>
 			<key>Timeout</key>
diff --git a/payloads/OpenCore/OpenCore-DEBUG.zip b/payloads/OpenCore/OpenCore-DEBUG.zip
index 0f567f529..05787f7e6 100644
Binary files a/payloads/OpenCore/OpenCore-DEBUG.zip and b/payloads/OpenCore/OpenCore-DEBUG.zip differ
diff --git a/payloads/OpenCore/OpenCore-RELEASE.zip b/payloads/OpenCore/OpenCore-RELEASE.zip
index 30b8ad8bc..4c5666c44 100644
Binary files a/payloads/OpenCore/OpenCore-RELEASE.zip and b/payloads/OpenCore/OpenCore-RELEASE.zip differ
diff --git a/payloads/Tools/ocvalidate-0.8.6 b/payloads/Tools/ocvalidate-0.8.6
deleted file mode 100755
index 055016cff..000000000
Binary files a/payloads/Tools/ocvalidate-0.8.6 and /dev/null differ
diff --git a/payloads/Tools/ocvalidate-0.8.7 b/payloads/Tools/ocvalidate-0.8.7
new file mode 100755
index 000000000..50d098078
Binary files /dev/null and b/payloads/Tools/ocvalidate-0.8.7 differ
diff --git a/resources/build/misc.py b/resources/build/misc.py
index 75a5b557f..7fcea149f 100644
--- a/resources/build/misc.py
+++ b/resources/build/misc.py
@@ -1,7 +1,7 @@
 # Class for handling Misc Patches, invocation from build.py
 # Copyright (C) 2020-2022, Dhinak G, Mykola Grymalyuk
 
-from resources import constants, device_probe, generate_smbios
+from resources import constants, device_probe, generate_smbios, utilities
 from resources.build import support
 from data import model_array, smbios_data, cpu_data
 
@@ -216,18 +216,15 @@ class build_misc:
         support.build_support(self.model, self.constants, self.config).get_efi_binary_by_path("OpenLinuxBoot.efi", "UEFI", "Drivers")["Enabled"] = True
         support.build_support(self.model, self.constants, self.config).get_efi_binary_by_path("ResetNvramEntry.efi", "UEFI", "Drivers")["Enabled"] = True
 
-        if self.constants.showpicker is True:
-            print("- Enabling ShowPicker")
-            self.config["Misc"]["Boot"]["ShowPicker"] = True
-        else:
+        if self.constants.showpicker is False:
             print("- Hiding OpenCore picker")
-            self.config["Misc"]["Boot"]["ShowPicker"] = False
+            self.config["Misc"]["Boot"]["ShowPicker"] = "Hide"
 
         if self.constants.oc_timeout != 5:
             print(f"- Setting custom OpenCore picker timeout to {self.constants.oc_timeout} seconds")
             self.config["Misc"]["Boot"]["Timeout"] = self.constants.oc_timeout
 
-        if self.constants.vault is True:
+        if self.constants.vault is True and utilities.check_command_line_tools() is True:
             print("- Setting Vault configuration")
             self.config["Misc"]["Security"]["Vault"] = "Secure"
             support.build_support(self.model, self.constants, self.config).get_efi_binary_by_path("OpenShell.efi", "Misc", "Tools")["Enabled"] = False
\ No newline at end of file
diff --git a/resources/constants.py b/resources/constants.py
index a999e21bd..d91c07418 100644
--- a/resources/constants.py
+++ b/resources/constants.py
@@ -26,8 +26,8 @@ class Constants:
 
         # OpenCore Versioning
         # https://github.com/acidanthera/OpenCorePkg
-        self.opencore_commit = "68a4ed5 - 11-07-2022"
-        self.opencore_version = "0.8.6"
+        self.opencore_commit = "5061093 - 11-16-2022"
+        self.opencore_version = "0.8.7"
 
         # Kext Versioning
         ## Acidanthera