diff --git a/README.md b/README.md
index cb2da5e..c6763d3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Component Builder Package (v3.2.0-beta3)
+# Component Builder Package (v3.2.0-beta4)
 
 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) [3.10](https://git.vdm.dev/joomla/Component-Builder/archive/3.10.zip)
-> 3.10
+- [joomla/Component-Builder](https://git.vdm.dev/joomla/Component-Builder) [3.x](https://git.vdm.dev/joomla/Component-Builder/archive/3.x.zip)
+> 3.x
 - [joomla/plg_content_componentbuilderadminheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuilderadminheaderstabs) [master](https://git.vdm.dev/joomla/plg_content_componentbuilderadminheaderstabs/archive/master.zip)
 > master
 - [joomla/plg_content_componentbuildercomponentdashboardheaderstabs](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentdashboardheaderstabs) [master](https://git.vdm.dev/joomla/plg_content_componentbuildercomponentdashboardheaderstabs/archive/master.zip)
diff --git a/install_component_builder.php b/install_component_builder.php
index b031218..1cb36b3 100644
--- a/install_component_builder.php
+++ b/install_component_builder.php
@@ -44,7 +44,7 @@ class pkg_component_builderInstallerScript
 	 */
 	protected function updateServerLocation()
 	{
-		$location = "https://git.vdm.dev/joomla/Component-Builder/raw/branch/3.10/componentbuilder_update_server.xml";
+		$location = "https://git.vdm.dev/joomla/Component-Builder/raw/branch/3.x/componentbuilder_update_server.xml";
 		$elements = ['pkg_component_builder', 'com_componentbuilder'];
 
 		// Get the Package Update Site Details
diff --git a/pkg_component_builder.xml b/pkg_component_builder.xml
index bcea6a4..73e2053 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.2.0-beta3</version>
+	<version>3.2.0-beta4</version>
 	<creationDate>March 2024</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
@@ -15,14 +15,14 @@
 	<description>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.</description>
 	<scriptfile>install_component_builder.php</scriptfile>
 	<updateservers>
-		<server type="extension" name="Component Builder Package - Updates" element="pkg_component_builder">https://git.vdm.dev/joomla/Component-Builder/raw/branch/3.10/componentbuilder_update_server.xml</server>
+		<server type="extension" name="Component Builder Package - Updates" element="pkg_component_builder">https://git.vdm.dev/joomla/Component-Builder/raw/branch/3.x/componentbuilder_update_server.xml</server>
 	</updateservers>
 	<languages folder="languages">
 		<language tag="en-GB">en-GB/en-GB.pkg_component_builder.sys.ini</language>
 		<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__3.10.zip</file>
+		<file type="component" id="com_componentbuilder">joomla__Component-Builder__3.x.zip</file>
 		<file type="plugin" id="ComponentBuilderAdminHeadersTabs" group="content">joomla__plg_content_componentbuilderadminheaderstabs__master.zip</file>
 		<file type="plugin" id="ComponentBuilderComponentDashboardHeadersTabs" group="content">joomla__plg_content_componentbuildercomponentdashboardheaderstabs__master.zip</file>
 		<file type="plugin" id="ComponentBuilderComponentHeadersTabs" group="content">joomla__plg_content_componentbuildercomponentheaderstabs__master.zip</file>
diff --git a/src/joomla__Component-Builder__3.10.zip b/src/joomla__Component-Builder__3.x.zip
similarity index 89%
rename from src/joomla__Component-Builder__3.10.zip
rename to src/joomla__Component-Builder__3.x.zip
index b5c504a..aac4506 100644
Binary files a/src/joomla__Component-Builder__3.10.zip and b/src/joomla__Component-Builder__3.x.zip differ
diff --git a/src/joomla__plg_content_componentbuilderadminheaderstabs__master.zip b/src/joomla__plg_content_componentbuilderadminheaderstabs__master.zip
index 517ac46..108f16c 100644
Binary files a/src/joomla__plg_content_componentbuilderadminheaderstabs__master.zip and b/src/joomla__plg_content_componentbuilderadminheaderstabs__master.zip differ
diff --git a/src/joomla__plg_content_componentbuildercomponentdashboardheaderstabs__master.zip b/src/joomla__plg_content_componentbuildercomponentdashboardheaderstabs__master.zip
index cb0a12e..984a457 100644
Binary files a/src/joomla__plg_content_componentbuildercomponentdashboardheaderstabs__master.zip and b/src/joomla__plg_content_componentbuildercomponentdashboardheaderstabs__master.zip differ
diff --git a/src/joomla__plg_content_componentbuildercomponentheaderstabs__master.zip b/src/joomla__plg_content_componentbuildercomponentheaderstabs__master.zip
index 072f02e..dc5ae10 100644
Binary files a/src/joomla__plg_content_componentbuildercomponentheaderstabs__master.zip and b/src/joomla__plg_content_componentbuildercomponentheaderstabs__master.zip differ
diff --git a/src/joomla__plg_content_componentbuildercustomadminheaderstabs__master.zip b/src/joomla__plg_content_componentbuildercustomadminheaderstabs__master.zip
index c5be00d..d68bc90 100644
Binary files a/src/joomla__plg_content_componentbuildercustomadminheaderstabs__master.zip and b/src/joomla__plg_content_componentbuildercustomadminheaderstabs__master.zip differ
diff --git a/src/joomla__plg_content_componentbuilderdynamicgetheaderstabs__master.zip b/src/joomla__plg_content_componentbuilderdynamicgetheaderstabs__master.zip
index 78b55a1..75ec206 100644
Binary files a/src/joomla__plg_content_componentbuilderdynamicgetheaderstabs__master.zip and b/src/joomla__plg_content_componentbuilderdynamicgetheaderstabs__master.zip differ
diff --git a/src/joomla__plg_content_componentbuilderfieldorderingtabs__master.zip b/src/joomla__plg_content_componentbuilderfieldorderingtabs__master.zip
index 22145ce..4fb46ce 100644
Binary files a/src/joomla__plg_content_componentbuilderfieldorderingtabs__master.zip and b/src/joomla__plg_content_componentbuilderfieldorderingtabs__master.zip differ
diff --git a/src/joomla__plg_content_componentbuilderlanguagetabs__master.zip b/src/joomla__plg_content_componentbuilderlanguagetabs__master.zip
index f342d6e..3f6acf5 100644
Binary files a/src/joomla__plg_content_componentbuilderlanguagetabs__master.zip and b/src/joomla__plg_content_componentbuilderlanguagetabs__master.zip differ
diff --git a/src/joomla__plg_content_componentbuilderprivacytabs__master.zip b/src/joomla__plg_content_componentbuilderprivacytabs__master.zip
index 80c744b..4a8bdb9 100644
Binary files a/src/joomla__plg_content_componentbuilderprivacytabs__master.zip and b/src/joomla__plg_content_componentbuilderprivacytabs__master.zip differ
diff --git a/src/joomla__plg_content_componentbuildersiteheaderstabs__master.zip b/src/joomla__plg_content_componentbuildersiteheaderstabs__master.zip
index 753039f..8ae4e93 100644
Binary files a/src/joomla__plg_content_componentbuildersiteheaderstabs__master.zip and b/src/joomla__plg_content_componentbuildersiteheaderstabs__master.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderactionlogcompiler__master.zip b/src/joomla__plg_extension_componentbuilderactionlogcompiler__master.zip
index e668d85..6e07298 100644
Binary files a/src/joomla__plg_extension_componentbuilderactionlogcompiler__master.zip and b/src/joomla__plg_extension_componentbuilderactionlogcompiler__master.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderexportcompiler__master.zip b/src/joomla__plg_extension_componentbuilderexportcompiler__master.zip
index eef4c8a..c932a33 100644
Binary files a/src/joomla__plg_extension_componentbuilderexportcompiler__master.zip and b/src/joomla__plg_extension_componentbuilderexportcompiler__master.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderfieldorderingcompiler__master.zip b/src/joomla__plg_extension_componentbuilderfieldorderingcompiler__master.zip
index aeef8b8..0d95e08 100644
Binary files a/src/joomla__plg_extension_componentbuilderfieldorderingcompiler__master.zip and b/src/joomla__plg_extension_componentbuilderfieldorderingcompiler__master.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderheaderscompiler__master.zip b/src/joomla__plg_extension_componentbuilderheaderscompiler__master.zip
index bed2159..c13cdc4 100644
Binary files a/src/joomla__plg_extension_componentbuilderheaderscompiler__master.zip and b/src/joomla__plg_extension_componentbuilderheaderscompiler__master.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderlanguagepackaging__master.zip b/src/joomla__plg_extension_componentbuilderlanguagepackaging__master.zip
index e5ab3ca..bacde7c 100644
Binary files a/src/joomla__plg_extension_componentbuilderlanguagepackaging__master.zip and b/src/joomla__plg_extension_componentbuilderlanguagepackaging__master.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderpowersautoloadercompiler__master.zip b/src/joomla__plg_extension_componentbuilderpowersautoloadercompiler__master.zip
index 40e6198..07a35ec 100644
Binary files a/src/joomla__plg_extension_componentbuilderpowersautoloadercompiler__master.zip and b/src/joomla__plg_extension_componentbuilderpowersautoloadercompiler__master.zip differ
diff --git a/src/joomla__plg_extension_componentbuilderprivacycompiler__master.zip b/src/joomla__plg_extension_componentbuilderprivacycompiler__master.zip
index f7507bc..5337a98 100644
Binary files a/src/joomla__plg_extension_componentbuilderprivacycompiler__master.zip and b/src/joomla__plg_extension_componentbuilderprivacycompiler__master.zip differ