diff --git a/README.md b/README.md
index cdc55b4..cce8cbc 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Component Builder Package (v3.1.7)
+# Component Builder Package (v3.1.8)
 
 The Joomla Component Builder Package that bundles JCB Component and all the plugins and features available into one package for easy install and update of your JCB system.
 
@@ -12,8 +12,8 @@ The Joomla Component Builder Package that bundles JCB Component and all the plug
 
 ## Extensions
 
-- [joomla/Component-Builder](https://git.vdm.dev/joomla/Component-Builder) [v3.1.7](https://git.vdm.dev/joomla/Component-Builder/archive/v3.1.7.zip)
-> Fixed power include issue.
+- [joomla/Component-Builder](https://git.vdm.dev/joomla/Component-Builder) [v3.1.8](https://git.vdm.dev/joomla/Component-Builder/archive/v3.1.8.zip)
+> Fixed power include issue in plugin.
 - [joomla/plg_content_componentbuilderadminheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuilderadminheaderstabs) [v2.0.0](https://git.vdm.dev/joomla/plg_content_componentbuilderadminheaderstabs/archive/v2.0.0.zip)
 > update - v2.0.0
 - [joomla/plg_content_componentbuildercomponentdashboardheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentdashboardheaderstabs) [v2.0.0](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentdashboardheaderstabs/archive/v2.0.0.zip)
@@ -38,8 +38,8 @@ The Joomla Component Builder Package that bundles JCB Component and all the plug
 > update - v1.0.1
 - [joomla/plg_extension_componentbuilderfieldorderingcompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderfieldorderingcompiler) [v1.0.1](https://git.vdm.dev/joomla/plg_extension_componentbuilderfieldorderingcompiler/archive/v1.0.1.zip)
 > update - v1.0.1
-- [joomla/plg_extension_componentbuilderheaderscompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderheaderscompiler) [v2.1.1](https://git.vdm.dev/joomla/plg_extension_componentbuilderheaderscompiler/archive/v2.1.1.zip)
-> update - v2.1.1
+- [joomla/plg_extension_componentbuilderheaderscompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderheaderscompiler) [v2.1.2](https://git.vdm.dev/joomla/plg_extension_componentbuilderheaderscompiler/archive/v2.1.2.zip)
+> update - v2.1.2
 - [joomla/plg_extension_componentbuilderlanguagepackaging](https://git.vdm.dev/joomla/plg_extension_componentbuilderlanguagepackaging) [v1.0.1](https://git.vdm.dev/joomla/plg_extension_componentbuilderlanguagepackaging/archive/v1.0.1.zip)
 > update - v1.0.1
 - [joomla/plg_extension_componentbuilderpowersautoloadercompiler](https://git.vdm.dev/joomla/plg_extension_componentbuilderpowersautoloadercompiler) [v1.0.2](https://git.vdm.dev/joomla/plg_extension_componentbuilderpowersautoloadercompiler/archive/v1.0.2.zip)
diff --git a/pkg_component_builder.xml b/pkg_component_builder.xml
index 906a187..d89ccbf 100644
--- a/pkg_component_builder.xml
+++ b/pkg_component_builder.xml
@@ -2,7 +2,7 @@
 <extension version="3.8" type="package" method="upgrade">
 	<name>PKG_COMPONENT_BUILDER</name>
 	<packagename>component_builder</packagename>
-	<version>3.1.7</version>
+	<version>3.1.8</version>
 	<creationDate>September 2022</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
@@ -21,7 +21,7 @@
 		<language tag="en-GB">en-GB/en-GB.pkg_component_builder.ini</language>
 	</languages>
 	<files folder="src">
-		<file type="component" id="com_componentbuilder">joomla__Component-Builder__v3.1.7.zip</file>
+		<file type="component" id="com_componentbuilder">joomla__Component-Builder__v3.1.8.zip</file>
 		<file type="plugin" id="ComponentBuilderAdminHeadersTabs" group="content">joomla__plg_content_componentbuilderadminheaderstabs__v2.0.0.zip</file>
 		<file type="plugin" id="ComponentBuilderComponentDashboardHeadersTabs" group="content">joomla__plg_content_componentbuildercomponentdashboardheaderstabs__v2.0.0.zip</file>
 		<file type="plugin" id="ComponentBuilderComponentHeadersTabs" group="content">joomla__plg_content_componentbuildercomponentheaderstabs__v2.0.0.zip</file>
@@ -34,7 +34,7 @@
 		<file type="plugin" id="ComponentBuilderActionLogCompiler" group="extension">joomla__plg_extension_componentbuilderactionlogcompiler__v1.0.2.zip</file>
 		<file type="plugin" id="ComponentBuilderExportCompiler" group="extension">joomla__plg_extension_componentbuilderexportcompiler__v1.0.1.zip</file>
 		<file type="plugin" id="ComponentBuilderFieldOrderingCompiler" group="extension">joomla__plg_extension_componentbuilderfieldorderingcompiler__v1.0.1.zip</file>
-		<file type="plugin" id="ComponentBuilderHeadersCompiler" group="extension">joomla__plg_extension_componentbuilderheaderscompiler__v2.1.1.zip</file>
+		<file type="plugin" id="ComponentBuilderHeadersCompiler" group="extension">joomla__plg_extension_componentbuilderheaderscompiler__v2.1.2.zip</file>
 		<file type="plugin" id="ComponentBuilderLanguagePackaging" group="extension">joomla__plg_extension_componentbuilderlanguagepackaging__v1.0.1.zip</file>
 		<file type="plugin" id="ComponentBuilderPowersAutoloaderCompiler" group="extension">joomla__plg_extension_componentbuilderpowersautoloadercompiler__v1.0.2.zip</file>
 		<file type="plugin" id="ComponentBuilderPrivacyCompiler" group="extension">joomla__plg_extension_componentbuilderprivacycompiler__v1.0.0.zip</file>
diff --git a/src/joomla__Component-Builder__v3.1.7.zip b/src/joomla__Component-Builder__v3.1.8.zip
similarity index 90%
rename from src/joomla__Component-Builder__v3.1.7.zip
rename to src/joomla__Component-Builder__v3.1.8.zip
index f806cf9..32c918f 100644
Binary files a/src/joomla__Component-Builder__v3.1.7.zip and b/src/joomla__Component-Builder__v3.1.8.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderheaderscompiler__v2.1.1.zip b/src/joomla__plg_extension_componentbuilderheaderscompiler__v2.1.1.zip
deleted file mode 100644
index e96ffd2..0000000
Binary files a/src/joomla__plg_extension_componentbuilderheaderscompiler__v2.1.1.zip and /dev/null differ
diff --git a/src/joomla__plg_extension_componentbuilderheaderscompiler__v2.1.2.zip b/src/joomla__plg_extension_componentbuilderheaderscompiler__v2.1.2.zip
new file mode 100644
index 0000000..4935966
Binary files /dev/null and b/src/joomla__plg_extension_componentbuilderheaderscompiler__v2.1.2.zip differ