diff --git a/.version b/.version
index f02113fe87..c3df54c9b8 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-3.15.0
+3.15.1
diff --git a/.vscode/settings.json b/.vscode/settings.json
index f01e7c5045..e13d54d778 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -24,7 +24,5 @@
             "url": "https://raw.githubusercontent.com/ToolJet/ToolJet/develop/plugins/schemas/manifest.schema.json"
         }
     ],
-    "CodeGPT.apiKey": "CodeGPT Plus Beta",
-    "workbench.colorTheme": "Cursor Dark",
-    "workbench.iconTheme": "vs-seti"
+    "CodeGPT.apiKey": "CodeGPT Plus Beta"
 }
\ No newline at end of file
diff --git a/frontend/.version b/frontend/.version
index f02113fe87..c3df54c9b8 100644
--- a/frontend/.version
+++ b/frontend/.version
@@ -1 +1 @@
-3.15.0
+3.15.1
diff --git a/frontend/ee b/frontend/ee
index 1e9e019c9e..fcefb9417e 160000
--- a/frontend/ee
+++ b/frontend/ee
@@ -1 +1 @@
-Subproject commit 1e9e019c9e9045c62ce3045c0e979c933add717b
+Subproject commit fcefb9417ea42d07e86236e12c3e6cb5160fe7c6
diff --git a/frontend/src/AppBuilder/RightSideBar/ComponentManagerTab/ComponentModuleTab/ComponentModuleTab.jsx b/frontend/src/AppBuilder/RightSideBar/ComponentManagerTab/ComponentModuleTab/ComponentModuleTab.jsx
index f1126ab4d5..d86d7e59d6 100644
--- a/frontend/src/AppBuilder/RightSideBar/ComponentManagerTab/ComponentModuleTab/ComponentModuleTab.jsx
+++ b/frontend/src/AppBuilder/RightSideBar/ComponentManagerTab/ComponentModuleTab/ComponentModuleTab.jsx
@@ -15,7 +15,6 @@ export const ComponentModuleTab = ({ onChangeTab }) => {
         <button
           className={`tj-drawer-tabs-btn tj-text-xsm ${activeTab == 1 && 'tj-drawer-tabs-btn-active'}`}
           onClick={() => handleChangeTab(1)}
-          data-cy="button-invite-with-email"
         >
           <span>Components</span>
         </button>
diff --git a/frontend/src/AppBuilder/RightSideBar/ComponentManagerTab/ComponentsManagerTab.jsx b/frontend/src/AppBuilder/RightSideBar/ComponentManagerTab/ComponentsManagerTab.jsx
index 7968e72e89..38783c3b51 100644
--- a/frontend/src/AppBuilder/RightSideBar/ComponentManagerTab/ComponentsManagerTab.jsx
+++ b/frontend/src/AppBuilder/RightSideBar/ComponentManagerTab/ComponentsManagerTab.jsx
@@ -7,8 +7,8 @@ import Fuse from 'fuse.js';
 import { SearchBox } from '@/_components';
 import { DragLayer } from './DragLayer';
 import useStore from '@/AppBuilder/_stores/store';
-import ComponentModuleTab from './ComponentModuleTab';
 import { ModuleManager } from '@/modules/Modules/components';
+import { ComponentModuleTab } from '@/modules/Appbuilder/components';
 
 // TODO: Hardcode all the component-section mapping in a constant file and just loop over it
 // TODO: styling
diff --git a/frontend/src/HomePage/HomePage.jsx b/frontend/src/HomePage/HomePage.jsx
index 3d883cd4b2..b0d698398e 100644
--- a/frontend/src/HomePage/HomePage.jsx
+++ b/frontend/src/HomePage/HomePage.jsx
@@ -1563,7 +1563,10 @@ class HomePageComponent extends React.Component {
                   ) : (
                     <p className="empty-title mt-3">
                       You have not created any modules.&nbsp;
-                      <a onClick={this.openCreateAppModal} className="text-bold">
+                      <a
+                        onClick={this.openCreateAppModal}
+                        className={`text-bold ${this.props.appType === 'module' && invalidLicense ? 'disabled' : ''}`}
+                      >
                         Create a module&nbsp;
                       </a>
                       to start using it within your apps.
diff --git a/frontend/src/modules/Appbuilder/components/ComponentModuleTab/ComponentModuleTab.jsx b/frontend/src/modules/Appbuilder/components/ComponentModuleTab/ComponentModuleTab.jsx
new file mode 100644
index 0000000000..72fb79a22d
--- /dev/null
+++ b/frontend/src/modules/Appbuilder/components/ComponentModuleTab/ComponentModuleTab.jsx
@@ -0,0 +1,9 @@
+import React from 'react';
+import { withEditionSpecificComponent } from '@/modules/common/helpers';
+import BaseComponentModuleTab from '@/modules/common/components/BaseComponentModuleTab';
+
+const ComponentModuleTab = (props) => {
+  return <BaseComponentModuleTab {...props} />;
+};
+
+export default withEditionSpecificComponent(ComponentModuleTab, 'Appbuilder');
diff --git a/frontend/src/modules/Appbuilder/components/ComponentModuleTab/index.js b/frontend/src/modules/Appbuilder/components/ComponentModuleTab/index.js
new file mode 100644
index 0000000000..fd4ccac17e
--- /dev/null
+++ b/frontend/src/modules/Appbuilder/components/ComponentModuleTab/index.js
@@ -0,0 +1 @@
+export { default } from './ComponentModuleTab';
diff --git a/frontend/src/modules/Appbuilder/components/index.js b/frontend/src/modules/Appbuilder/components/index.js
index b1778f177f..196fb3b07b 100644
--- a/frontend/src/modules/Appbuilder/components/index.js
+++ b/frontend/src/modules/Appbuilder/components/index.js
@@ -4,5 +4,14 @@ import LogoNavDropdown from './LogoNavDropdown';
 import AppEnvironments from './AppEnvironments';
 import ThemeSelect from './ThemeSelect';
 import ColorSwatches from './ColorSwatches';
+import ComponentModuleTab from './ComponentModuleTab';
 
-export { CreateVersionModal, PromoteReleaseButton, LogoNavDropdown, AppEnvironments, ThemeSelect, ColorSwatches };
+export {
+  CreateVersionModal,
+  PromoteReleaseButton,
+  LogoNavDropdown,
+  AppEnvironments,
+  ThemeSelect,
+  ColorSwatches,
+  ComponentModuleTab,
+};
diff --git a/frontend/src/modules/common/components/BaseComponentModuleTab/BaseComponentModuleTab.jsx b/frontend/src/modules/common/components/BaseComponentModuleTab/BaseComponentModuleTab.jsx
new file mode 100644
index 0000000000..dff31d7dc5
--- /dev/null
+++ b/frontend/src/modules/common/components/BaseComponentModuleTab/BaseComponentModuleTab.jsx
@@ -0,0 +1,7 @@
+import React from 'react';
+
+const BaseComponentModuleTab = () => {
+  return <p className="widgets-manager-header">Components</p>;
+};
+
+export default BaseComponentModuleTab;
diff --git a/frontend/src/modules/common/components/BaseComponentModuleTab/index.js b/frontend/src/modules/common/components/BaseComponentModuleTab/index.js
new file mode 100644
index 0000000000..d533caf28e
--- /dev/null
+++ b/frontend/src/modules/common/components/BaseComponentModuleTab/index.js
@@ -0,0 +1 @@
+export { default } from './BaseComponentModuleTab';
diff --git a/frontend/src/modules/common/components/index.js b/frontend/src/modules/common/components/index.js
index 1261db54ec..db859e3ca5 100644
--- a/frontend/src/modules/common/components/index.js
+++ b/frontend/src/modules/common/components/index.js
@@ -26,6 +26,7 @@ import BaseOnboardingQuestions from './BaseOnboardingQuestions';
 import BaseSetupAdminPage from './BaseSetupAdminPage';
 import UsersTable from './UsersTable';
 import BaseColorSwatches from './BaseColorSwatches';
+import BaseComponentModuleTab from './BaseComponentModuleTab';
 
 export {
   FormTextInput,
@@ -56,4 +57,5 @@ export {
   BaseOnboardingQuestions,
   BaseSetupAdminPage,
   UsersTable,
+  BaseComponentModuleTab,
 };
diff --git a/server/.version b/server/.version
index f02113fe87..c3df54c9b8 100644
--- a/server/.version
+++ b/server/.version
@@ -1 +1 @@
-3.15.0
+3.15.1