diff --git a/packages/js/email-editor/src/blocks/core/button.ts b/packages/js/email-editor/src/blocks/core/button.ts
index 9f48130845..2d23e62a10 100644
--- a/packages/js/email-editor/src/blocks/core/button.ts
+++ b/packages/js/email-editor/src/blocks/core/button.ts
@@ -1,5 +1,5 @@
 import { addFilter } from '@wordpress/hooks';
-import { Block } from '@wordpress/blocks';
+import { Block } from '@wordpress/blocks/index';
 
 /**
  * Disables Styles for button
diff --git a/packages/js/email-editor/src/blocks/core/buttons.ts b/packages/js/email-editor/src/blocks/core/buttons.ts
index ad53f2b072..cadcde2e6c 100644
--- a/packages/js/email-editor/src/blocks/core/buttons.ts
+++ b/packages/js/email-editor/src/blocks/core/buttons.ts
@@ -1,5 +1,5 @@
 import { addFilter } from '@wordpress/hooks';
-import { Block } from '@wordpress/blocks';
+import { Block } from '@wordpress/blocks/index';
 
 /**
  * Switch layout to reduced flex email layout
diff --git a/packages/js/email-editor/src/blocks/core/column.ts b/packages/js/email-editor/src/blocks/core/column.ts
index c97f779de2..c8d7ebb2a5 100644
--- a/packages/js/email-editor/src/blocks/core/column.ts
+++ b/packages/js/email-editor/src/blocks/core/column.ts
@@ -1,5 +1,5 @@
 import { addFilter } from '@wordpress/hooks';
-import { Block } from '@wordpress/blocks';
+import { Block } from '@wordpress/blocks/index';
 
 function enhanceColumnBlock() {
 	addFilter(
diff --git a/packages/js/email-editor/src/blocks/core/columns.tsx b/packages/js/email-editor/src/blocks/core/columns.tsx
index 1833d991f8..ab1dd4e9a3 100644
--- a/packages/js/email-editor/src/blocks/core/columns.tsx
+++ b/packages/js/email-editor/src/blocks/core/columns.tsx
@@ -1,6 +1,6 @@
 import { InspectorControls } from '@wordpress/block-editor';
 import { createHigherOrderComponent } from '@wordpress/compose';
-import { Block } from '@wordpress/blocks';
+import { Block } from '@wordpress/blocks/index';
 import { addFilter } from '@wordpress/hooks';
 
 const columnsEditCallback = createHigherOrderComponent(
diff --git a/packages/js/email-editor/src/blocks/core/general-block-support.ts b/packages/js/email-editor/src/blocks/core/general-block-support.ts
index cf8c105dc5..031456c6f6 100644
--- a/packages/js/email-editor/src/blocks/core/general-block-support.ts
+++ b/packages/js/email-editor/src/blocks/core/general-block-support.ts
@@ -2,7 +2,7 @@ import { addFilter } from '@wordpress/hooks';
 import {
 	Block as WPBlock,
 	BlockSupports as WPBlockSupports,
-} from '@wordpress/blocks';
+} from '@wordpress/blocks/index';
 
 // Extend the BlockSupports type to include shadow
 // The shadow is not included in WP6.4 but it is in WP6.5
diff --git a/packages/js/email-editor/src/blocks/core/image.tsx b/packages/js/email-editor/src/blocks/core/image.tsx
index 9b9713a71d..80492187c4 100644
--- a/packages/js/email-editor/src/blocks/core/image.tsx
+++ b/packages/js/email-editor/src/blocks/core/image.tsx
@@ -1,7 +1,7 @@
 import { InspectorControls } from '@wordpress/block-editor';
 import { createHigherOrderComponent } from '@wordpress/compose';
 import { addFilter } from '@wordpress/hooks';
-import { Block } from '@wordpress/blocks';
+import { Block } from '@wordpress/blocks/index';
 
 const imageEditCallback = createHigherOrderComponent(
 	( BlockEdit ) =>
diff --git a/packages/js/email-editor/src/blocks/core/post-content.tsx b/packages/js/email-editor/src/blocks/core/post-content.tsx
index e7701d5635..e72cbd80fa 100644
--- a/packages/js/email-editor/src/blocks/core/post-content.tsx
+++ b/packages/js/email-editor/src/blocks/core/post-content.tsx
@@ -1,5 +1,5 @@
 import { addFilter } from '@wordpress/hooks';
-import { Block } from '@wordpress/blocks';
+import { Block } from '@wordpress/blocks/index';
 import { __ } from '@wordpress/i18n';
 import { useBlockProps } from '@wordpress/block-editor';
 
diff --git a/packages/js/email-editor/src/components/sidebar/templates-panel.tsx b/packages/js/email-editor/src/components/sidebar/templates-panel.tsx
index e4a5ad2af8..439bdedde2 100644
--- a/packages/js/email-editor/src/components/sidebar/templates-panel.tsx
+++ b/packages/js/email-editor/src/components/sidebar/templates-panel.tsx
@@ -10,8 +10,8 @@ import {
 	parse,
 	// @ts-expect-error No types available for this yet.
 	__unstableSerializeAndClean, // eslint-disable-line
-	BlockInstance,
 } from '@wordpress/blocks';
+import { BlockInstance } from '@wordpress/blocks/index';
 import { addQueryArgs } from '@wordpress/url';
 import { storeName } from '../../store';
 
diff --git a/packages/js/email-editor/src/hooks/use-preview-templates.ts b/packages/js/email-editor/src/hooks/use-preview-templates.ts
index 1537ba494b..6393aa2fe0 100644
--- a/packages/js/email-editor/src/hooks/use-preview-templates.ts
+++ b/packages/js/email-editor/src/hooks/use-preview-templates.ts
@@ -1,4 +1,5 @@
-import { BlockInstance, parse } from '@wordpress/blocks';
+import { parse } from '@wordpress/blocks';
+import { BlockInstance } from '@wordpress/blocks/index';
 import { useSelect } from '@wordpress/data';
 import { store as blockEditorStore } from '@wordpress/block-editor';
 import { storeName, EmailTemplatePreview, TemplatePreview } from '../store';
diff --git a/packages/js/email-editor/src/layouts/flex-email.tsx b/packages/js/email-editor/src/layouts/flex-email.tsx
index 135d744450..b121ef8742 100644
--- a/packages/js/email-editor/src/layouts/flex-email.tsx
+++ b/packages/js/email-editor/src/layouts/flex-email.tsx
@@ -8,7 +8,8 @@ import classnames from 'classnames';
  */
 import { createHigherOrderComponent } from '@wordpress/compose';
 import { addFilter } from '@wordpress/hooks';
-import { Block, getBlockSupport, hasBlockSupport } from '@wordpress/blocks';
+import { getBlockSupport, hasBlockSupport } from '@wordpress/blocks';
+import { Block } from '@wordpress/blocks/index';
 
 import {
 	BlockControls,
diff --git a/packages/js/email-editor/src/store/selectors.ts b/packages/js/email-editor/src/store/selectors.ts
index 4026186de8..2921e9a2ee 100644
--- a/packages/js/email-editor/src/store/selectors.ts
+++ b/packages/js/email-editor/src/store/selectors.ts
@@ -3,7 +3,8 @@ import { store as coreDataStore } from '@wordpress/core-data';
 import { store as interfaceStore } from '@wordpress/interface';
 import { store as editorStore } from '@wordpress/editor';
 import { store as preferencesStore } from '@wordpress/preferences';
-import { serialize, BlockInstance } from '@wordpress/blocks';
+import { serialize } from '@wordpress/blocks';
+import { BlockInstance } from '@wordpress/blocks/index';
 import { storeName } from './constants';
 import { State, Feature, EmailTemplate } from './types';
 
diff --git a/packages/js/email-editor/src/store/store.ts b/packages/js/email-editor/src/store/store.ts
index 4e1b69fb60..61e0bd18ee 100644
--- a/packages/js/email-editor/src/store/store.ts
+++ b/packages/js/email-editor/src/store/store.ts
@@ -28,8 +28,8 @@ export const createStore = () => {
 };
 
 export interface EmailEditorStore {
-	getActions(): EditorStoreConfig[ 'actions' ];
-	getSelectors(): EditorStoreConfig[ 'selectors' ];
+	getActions: () => EditorStoreConfig[ 'actions' ];
+	getSelectors: () => EditorStoreConfig[ 'selectors' ];
 }
 
 declare module '@wordpress/data' {
diff --git a/packages/js/email-editor/src/store/types.ts b/packages/js/email-editor/src/store/types.ts
index 8abbdd580d..5b858f0f00 100644
--- a/packages/js/email-editor/src/store/types.ts
+++ b/packages/js/email-editor/src/store/types.ts
@@ -1,5 +1,5 @@
-import { EditorSettings, EditorColor } from '@wordpress/block-editor';
-import { BlockInstance } from '@wordpress/blocks';
+import { EditorSettings, EditorColor } from '@wordpress/block-editor/index';
+import { BlockInstance } from '@wordpress/blocks/index';
 
 export enum SendingPreviewStatus {
 	SUCCESS = 'success',
diff --git a/packages/js/email-editor/src/types/wordpress-modules.ts b/packages/js/email-editor/src/types/wordpress-modules.ts
index 484501ecf3..b14abbefd5 100644
--- a/packages/js/email-editor/src/types/wordpress-modules.ts
+++ b/packages/js/email-editor/src/types/wordpress-modules.ts
@@ -119,14 +119,14 @@ declare module '@wordpress/notices' {
 			) => void;
 		};
 		selectors: {
-			getNotices( state: unknown, context?: string ): Notice[];
-			removeNotice( id: string, context?: string ): void;
+			getNotices: ( state: unknown, context?: string ) => Notice[];
+			removeNotice: ( id: string, context?: string ) => void;
 		};
 	} >;
 }
 
 declare module '@wordpress/core-data' {
-	import { BlockInstance } from '@wordpress/blocks';
+	import { BlockInstance } from '@wordpress/blocks/index';
 
 	export function useEntityBlockEditor(
 		kind: string,