diff --git a/Scripts/config_prodigy.py b/Scripts/config_prodigy.py
index e2f276f..3d274c1 100644
--- a/Scripts/config_prodigy.py
+++ b/Scripts/config_prodigy.py
@@ -502,7 +502,7 @@ class ConfigProdigy:
         
         return kernel_patch
 
-    def boot_args(self, hardware_report, macos_version, kexts, config):
+    def boot_args(self, hardware_report, macos_version, needs_oclp, kexts, config):
         boot_args = [
             "-v",
             "debug=0x100",
@@ -513,6 +513,10 @@ class ConfigProdigy:
             boot_args.append("npci=0x2000")
 
         for kext in kexts:
+            if kext.name == "AMFIPass":
+                if needs_oclp and not kext.checked:
+                    boot_args.append("amfi=0x80")
+
             if not kext.checked:
                 continue
 
@@ -682,7 +686,7 @@ class ConfigProdigy:
         config["Misc"]["Tools"] = []
 
         del config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["#INFO (prev-lang:kbd)"]
-        config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] = self.boot_args(hardware_report, macos_version, kexts, config)
+        config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["boot-args"] = self.boot_args(hardware_report, macos_version, needs_oclp, kexts, config)
         config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["csr-active-config"] = self.utils.hex_to_bytes(self.csr_active_config(macos_version))
         config["NVRAM"]["Add"]["7C436110-AB2A-4BBB-A880-FE41995C9F82"]["prev-lang:kbd"] = self.utils.hex_to_bytes("")
 
diff --git a/Scripts/kext_maestro.py b/Scripts/kext_maestro.py
index e23de4f..1601f5c 100644
--- a/Scripts/kext_maestro.py
+++ b/Scripts/kext_maestro.py
@@ -237,7 +237,7 @@ class KextMaestro:
             selected_kexts.append("CpuTscSync")
 
         if needs_oclp:
-            selected_kexts.extend(("AMFIPass", "RestrictEvents"))
+            selected_kexts.extend(("AMFIPass", "RestrictEvents") if self.utils.parse_darwin_version(macos_version) < self.utils.parse_darwin_version("25.0.0") else ("RestrictEvents"))
 
         for network_name, network_props in hardware_report.get("Network", {}).items():
             device_id = network_props.get("Device ID")