diff --git a/CHANGELOG.md b/CHANGELOG.md
index b05ea1d81..21927d05a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
 - Increment AppleBackLightFixup v1.0.1
   - Add panel type F10T9cde
 - Enhance HDMI audio support on Mac Pros and Xserves
+- Strip unused kext entries during build
 
 ## 0.0.22
 - Add ExFat support for models missing driver
diff --git a/Resources/Build.py b/Resources/Build.py
index cc5e5dcd2..e518c4244 100644
--- a/Resources/Build.py
+++ b/Resources/Build.py
@@ -502,6 +502,10 @@ class BuildOpenCore:
 
     def cleanup(self):
         print("- Cleaning up files")
+        # Remove unused kexts
+        for kext in list(self.config["Kernel"]["Add"]):
+            if not kext["Enabled"]:
+                self.config["Kernel"]["Add"].remove(kext)
         plistlib.dump(self.config, Path(self.constants.plist_path).open("wb"), sort_keys=True)
         for kext in self.constants.kexts_path.rglob("*.zip"):
             with zipfile.ZipFile(kext) as zip_file:
diff --git a/Resources/Constants.py b/Resources/Constants.py
index c1faac57b..391575464 100644
--- a/Resources/Constants.py
+++ b/Resources/Constants.py
@@ -87,9 +87,9 @@ class Constants:
     # Payload Location
     # OpenCore
     @property
-    def opencore_zip_source(self): return self.payload_path / Path(f"OpenCore/OpenCore-{self.opencore_build}-v{self.opencore_version}.zip")
+    def opencore_zip_source(self): return self.payload_path / Path(f"OpenCore/OpenCore-{self.opencore_build}.zip")
     @property
-    def plist_template(self): return self.payload_path / Path(f"Config/v{self.opencore_version}/config.plist")
+    def plist_template(self): return self.payload_path / Path(f"Config/config.plist")
 
     # ACPI
     @property
@@ -155,9 +155,9 @@ class Constants:
     @property
     def build_path(self): return self.current_path / Path("Build-Folder/")
     @property
-    def opencore_release_folder(self): return self.build_path / Path(f"OpenCore-{self.opencore_build}-v{self.opencore_version}")
+    def opencore_release_folder(self): return self.build_path / Path(f"OpenCore-{self.opencore_build}")
     @property
-    def opencore_zip_copied(self): return self.build_path / Path(f"OpenCore-{self.opencore_build}-v{self.opencore_version}.zip")
+    def opencore_zip_copied(self): return self.build_path / Path(f"OpenCore-{self.opencore_build}.zip")
 
     @property
     def oc_folder(self): return self.opencore_release_folder / Path("EFI/OC/")
diff --git a/payloads/Config/v0.6.8/config.plist b/payloads/Config/config.plist
similarity index 100%
rename from payloads/Config/v0.6.8/config.plist
rename to payloads/Config/config.plist
diff --git a/payloads/OpenCore/OpenCore-DEBUG-v0.6.8.zip b/payloads/OpenCore/OpenCore-DEBUG.zip
similarity index 98%
rename from payloads/OpenCore/OpenCore-DEBUG-v0.6.8.zip
rename to payloads/OpenCore/OpenCore-DEBUG.zip
index d1b79dee6..bdb452ba0 100644
Binary files a/payloads/OpenCore/OpenCore-DEBUG-v0.6.8.zip and b/payloads/OpenCore/OpenCore-DEBUG.zip differ
diff --git a/payloads/OpenCore/OpenCore-RELEASE.zip b/payloads/OpenCore/OpenCore-RELEASE.zip
new file mode 100644
index 000000000..f0b9029ad
Binary files /dev/null and b/payloads/OpenCore/OpenCore-RELEASE.zip differ