diff --git a/CHANGELOG.md b/CHANGELOG.md
index 467ca5a7e..d0b7df2cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@
 - Fix AirPlay to Mac on macOS 12.1
 - Add macOS InstallAssistant downloader to TUI
 - Resolve rare memory corruption due to FeatureUnlock
+- Raise SurPlus MaxKernel to 21.99.99
 
 ## 0.3.1
 - Increment Binaries:
diff --git a/payloads/Config/config.plist b/payloads/Config/config.plist
index ce1ccfb25..ad84eba33 100644
--- a/payloads/Config/config.plist
+++ b/payloads/Config/config.plist
@@ -1273,7 +1273,7 @@
 				<key>Mask</key>
 				<data></data>
 				<key>MaxKernel</key>
-				<string>21.1.0</string>
+				<string>21.99.99</string>
 				<key>MinKernel</key>
 				<string>20.4.0</string>
 				<key>Replace</key>
@@ -1303,7 +1303,7 @@
 				<key>Mask</key>
 				<data></data>
 				<key>MaxKernel</key>
-				<string>21.1.0</string>
+				<string>21.99.99</string>
 				<key>MinKernel</key>
 				<string>20.4.0</string>
 				<key>Replace</key>
diff --git a/resources/build.py b/resources/build.py
index 0be276d27..ffc94388d 100644
--- a/resources/build.py
+++ b/resources/build.py
@@ -180,7 +180,10 @@ class BuildOpenCore:
                 # Applicable for pre-Ivy Bridge models
                 self.enable_kext("CatalinaBCM5701Ethernet.kext", self.constants.bcm570_version, self.constants.bcm570_path)
 
-        if smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.cpu_data.sandy_bridge.value:
+        # i3 Ivy Bridge iMacs don't support RDRAND
+        # However for prebuilt, assume they do
+        if (not self.constants.custom_model and "RDRAND" not in self.computer.cpu.flags) or \
+            (smbios_data.smbios_dictionary[self.model]["CPU Generation"] <= cpu_data.cpu_data.sandy_bridge.value):
             # Ref: https://github.com/reenigneorcim/SurPlus
             # Enable for all systems missing RDRAND support
             print("- Adding SurPlus Patch for Race Condition")
diff --git a/resources/cli_menu.py b/resources/cli_menu.py
index 95e91c75b..3b97bc136 100644
--- a/resources/cli_menu.py
+++ b/resources/cli_menu.py
@@ -751,9 +751,9 @@ Note: Only supported on Nehalem and newer MacBooks (2010+)
         utilities.header(["Override SurPlus MaxKernel"])
         print(
             """
-By default OCLP will only allow SurPlus to be used on kernels 21.1.0
-and older (ie. Monterey beta 7 and older). This is for saftey reasons 
-in the event newer OSes may break compatibility and result in boot loops.
+By default OCLP will only allow SurPlus to be used on Monterey and older.
+This is for saftey reasons in the event newer OSes may break compatibility
+and result in boot loops.
 
 Enabling this option will allow SurPlus to have no MaxKernel set, and 
 therefore allow it to run on anything newer than 11.2.3. However if you