diff --git a/api-tests/core/admin/admin-permission.test.api.js b/api-tests/core/admin/admin-permission.test.api.js
index 4f9e7d075a..50e14a23ce 100644
--- a/api-tests/core/admin/admin-permission.test.api.js
+++ b/api-tests/core/admin/admin-permission.test.api.js
@@ -34,7 +34,7 @@ describe('Role CRUD End to End', () => {
     sortedData.conditions = sortedData.conditions.sort();
 
     // eslint-disable-next-line node/no-extraneous-require
-    const { features } = require('@strapi/strapi/dist/utils/ee');
+    const { features } = require('@strapi/strapi/dist/utils/ee').default;
     const hasSSO = features.isEnabled('sso');
 
     if (hasSSO) {
diff --git a/examples/getstarted/src/api/address/services/address.js b/examples/getstarted/src/api/address/services/address.js
index d53c6a3a30..949c82c030 100644
--- a/examples/getstarted/src/api/address/services/address.js
+++ b/examples/getstarted/src/api/address/services/address.js
@@ -1,7 +1,3 @@
 const { createCoreService } = require('@strapi/strapi').factories;
 
-module.exports = createCoreService('api::address.address', {
-  async find(coucou) {
-    return [{ coucou }];
-  }
-});
+module.exports = createCoreService('api::address.address');
diff --git a/packages/core/admin/ee/server/bootstrap.js b/packages/core/admin/ee/server/bootstrap.js
index 8e4b0ad6cc..955015950b 100644
--- a/packages/core/admin/ee/server/bootstrap.js
+++ b/packages/core/admin/ee/server/bootstrap.js
@@ -1,7 +1,7 @@
 'use strict';
 
 // eslint-disable-next-line node/no-extraneous-require
-const { features } = require('@strapi/strapi/dist/utils/ee');
+const { features } = require('@strapi/strapi/dist/utils/ee').default;
 const executeCEBootstrap = require('../../server/bootstrap');
 const { getService } = require('../../server/utils');
 const actions = require('./config/admin-actions');
diff --git a/packages/core/admin/ee/server/controllers/admin.js b/packages/core/admin/ee/server/controllers/admin.js
index 7d1ff987bd..594336772e 100644
--- a/packages/core/admin/ee/server/controllers/admin.js
+++ b/packages/core/admin/ee/server/controllers/admin.js
@@ -2,7 +2,7 @@
 
 const { isNil } = require('lodash/fp');
 // eslint-disable-next-line node/no-extraneous-require
-const ee = require('@strapi/strapi/dist/utils/ee');
+const ee = require('@strapi/strapi/dist/utils/ee').default;
 const { env } = require('@strapi/utils');
 const { getService } = require('../../../server/utils');
 
diff --git a/packages/core/admin/ee/server/controllers/user.js b/packages/core/admin/ee/server/controllers/user.js
index 1a5534cd82..dcc5c385ff 100644
--- a/packages/core/admin/ee/server/controllers/user.js
+++ b/packages/core/admin/ee/server/controllers/user.js
@@ -1,7 +1,7 @@
 'use strict';
 
 // eslint-disable-next-line node/no-extraneous-require
-const ee = require('@strapi/strapi/dist/utils/ee');
+const ee = require('@strapi/strapi/dist/utils/ee').default;
 const _ = require('lodash');
 const { pick, isNil } = require('lodash/fp');
 const { ApplicationError, ForbiddenError } = require('@strapi/utils').errors;
diff --git a/packages/core/admin/ee/server/destroy.js b/packages/core/admin/ee/server/destroy.js
index 9be8cce68f..a22196c974 100644
--- a/packages/core/admin/ee/server/destroy.js
+++ b/packages/core/admin/ee/server/destroy.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { features } = require('@strapi/strapi/dist/utils/ee');
+const { features } = require('@strapi/strapi/dist/utils/ee').default;
 const executeCEDestroy = require('../../server/destroy');
 
 module.exports = async ({ strapi }) => {
diff --git a/packages/core/admin/ee/server/register.js b/packages/core/admin/ee/server/register.js
index a8e29f8037..e8eb272b71 100644
--- a/packages/core/admin/ee/server/register.js
+++ b/packages/core/admin/ee/server/register.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { features } = require('@strapi/strapi/dist/utils/ee');
+const { features } = require('@strapi/strapi/dist/utils/ee').default;
 const executeCERegister = require('../../server/register');
 const migrateAuditLogsTable = require('./migrations/audit-logs-table');
 const migrateReviewWorkflowStagesColor = require('./migrations/review-workflows-stages-color');
diff --git a/packages/core/admin/ee/server/routes/utils.js b/packages/core/admin/ee/server/routes/utils.js
index 4d0b89debe..3fdb4aa963 100644
--- a/packages/core/admin/ee/server/routes/utils.js
+++ b/packages/core/admin/ee/server/routes/utils.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { features } = require('@strapi/strapi/dist/utils/ee');
+const { features } = require('@strapi/strapi/dist/utils/ee').default;
 
 const enableFeatureMiddleware = (featureName) => (ctx, next) => {
   if (features.isEnabled(featureName)) {
diff --git a/packages/core/admin/ee/server/services/__tests__/audit-logs.test.js b/packages/core/admin/ee/server/services/__tests__/audit-logs.test.js
index 8c48ba2b75..29674b3fbb 100644
--- a/packages/core/admin/ee/server/services/__tests__/audit-logs.test.js
+++ b/packages/core/admin/ee/server/services/__tests__/audit-logs.test.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { features } = require('@strapi/strapi/dist/utils/ee');
+const { features } = require('@strapi/strapi/dist/utils/ee').default;
 const { register } = require('@strapi/provider-audit-logs-local');
 const { scheduleJob } = require('node-schedule');
 const createAuditLogsService = require('../audit-logs');
diff --git a/packages/core/admin/ee/server/services/audit-logs.js b/packages/core/admin/ee/server/services/audit-logs.js
index 6e3b96a5a3..0aebc0292a 100644
--- a/packages/core/admin/ee/server/services/audit-logs.js
+++ b/packages/core/admin/ee/server/services/audit-logs.js
@@ -2,7 +2,7 @@
 
 const localProvider = require('@strapi/provider-audit-logs-local');
 const { scheduleJob } = require('node-schedule');
-const { features } = require('@strapi/strapi/dist/utils/ee');
+const { features } = require('@strapi/strapi/dist/utils/ee').default;
 
 const DEFAULT_RETENTION_DAYS = 90;
 
diff --git a/packages/core/admin/ee/server/services/passport.js b/packages/core/admin/ee/server/services/passport.js
index 881276481f..e5e6947fd7 100644
--- a/packages/core/admin/ee/server/services/passport.js
+++ b/packages/core/admin/ee/server/services/passport.js
@@ -1,7 +1,7 @@
 'use strict';
 
 // eslint-disable-next-line node/no-extraneous-require
-const { features } = require('@strapi/strapi/dist/utils/ee');
+const { features } = require('@strapi/strapi/dist/utils/ee').default;
 
 const { UnauthorizedError } = require('@strapi/utils').errors;
 const createLocalStrategy = require('../../../server/services/passport/local-strategy');
diff --git a/packages/core/admin/ee/server/services/passport/sso.js b/packages/core/admin/ee/server/services/passport/sso.js
index a38c95e539..8eb487f38b 100644
--- a/packages/core/admin/ee/server/services/passport/sso.js
+++ b/packages/core/admin/ee/server/services/passport/sso.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const ee = require('@strapi/strapi/dist/utils/ee');
+const ee = require('@strapi/strapi/dist/utils/ee').default;
 const { authEventsMapper } = require('../../../../server/services/passport');
 const createProviderRegistry = require('./provider-registry');
 
diff --git a/packages/core/admin/ee/server/services/seat-enforcement.js b/packages/core/admin/ee/server/services/seat-enforcement.js
index e8fd99f277..a5c690c430 100644
--- a/packages/core/admin/ee/server/services/seat-enforcement.js
+++ b/packages/core/admin/ee/server/services/seat-enforcement.js
@@ -1,7 +1,7 @@
 'use strict';
 
 // eslint-disable-next-line node/no-extraneous-require
-const ee = require('@strapi/strapi/dist/utils/ee');
+const ee = require('@strapi/strapi/dist/utils/ee').default;
 const { take, drop, map, prop, pick, reverse, isNil } = require('lodash/fp');
 const { getService } = require('../../../server/utils');
 const { SUPER_ADMIN_CODE } = require('../../../server/services/constants');
diff --git a/packages/core/admin/ee/server/utils/sso-lock.js b/packages/core/admin/ee/server/utils/sso-lock.js
index 88f7533c0f..d92ab33043 100644
--- a/packages/core/admin/ee/server/utils/sso-lock.js
+++ b/packages/core/admin/ee/server/utils/sso-lock.js
@@ -1,6 +1,6 @@
 'use strict';
 
-const { features } = require('@strapi/strapi/dist/utils/ee');
+const { features } = require('@strapi/strapi/dist/utils/ee').default;
 const { isEmpty } = require('lodash/fp');
 
 const isSsoLocked = async (user) => {
diff --git a/packages/core/admin/ee/server/validation/role.js b/packages/core/admin/ee/server/validation/role.js
index 2ed7fc231c..2fcc98be04 100644
--- a/packages/core/admin/ee/server/validation/role.js
+++ b/packages/core/admin/ee/server/validation/role.js
@@ -2,7 +2,7 @@
 
 const { yup, validateYupSchema } = require('@strapi/utils');
 // eslint-disable-next-line node/no-extraneous-require
-const { features } = require('@strapi/strapi/dist/utils/ee');
+const { features } = require('@strapi/strapi/dist/utils/ee').default;
 
 const roleCreateSchema = yup
   .object()
diff --git a/packages/core/admin/ee/server/validation/user.js b/packages/core/admin/ee/server/validation/user.js
index 9ea070c759..09d21d428b 100644
--- a/packages/core/admin/ee/server/validation/user.js
+++ b/packages/core/admin/ee/server/validation/user.js
@@ -2,7 +2,7 @@
 
 const { yup, validateYupSchema } = require('@strapi/utils');
 // eslint-disable-next-line node/no-extraneous-require
-const { features } = require('@strapi/strapi/dist/utils/ee');
+const { features } = require('@strapi/strapi/dist/utils/ee').default;
 const { schemas } = require('../../../server/validation/user');
 
 const ssoUserCreationInputExtension = yup
diff --git a/packages/core/admin/server/controllers/admin.js b/packages/core/admin/server/controllers/admin.js
index 1a97a06981..88c50cba7b 100644
--- a/packages/core/admin/server/controllers/admin.js
+++ b/packages/core/admin/server/controllers/admin.js
@@ -8,7 +8,7 @@ const { exists } = require('fs-extra');
 const { env } = require('@strapi/utils');
 const { isUsingTypeScript } = require('@strapi/typescript-utils');
 // eslint-disable-next-line node/no-extraneous-require
-const ee = require('@strapi/strapi/dist/utils/ee');
+const ee = require('@strapi/strapi/dist/utils/ee').default;
 
 const {
   validateUpdateProjectSettings,
diff --git a/packages/core/data-transfer/src/commands/__tests__/commands.test.utils.ts b/packages/core/data-transfer/src/commands/__tests__/commands.test.utils.ts
index f4b8b5c0ff..6a948b86fc 100644
--- a/packages/core/data-transfer/src/commands/__tests__/commands.test.utils.ts
+++ b/packages/core/data-transfer/src/commands/__tests__/commands.test.utils.ts
@@ -1,3 +1,4 @@
+// TODO: move to a test-utils internal pkg
 import type { Utils } from '@strapi/typings';
 
 const expectExit = async (code: number, fn: Utils.Function.Any) => {
diff --git a/packages/core/data-transfer/src/strapi/providers/local-source/assets.ts b/packages/core/data-transfer/src/strapi/providers/local-source/assets.ts
index 249760bfac..45814bfaaf 100644
--- a/packages/core/data-transfer/src/strapi/providers/local-source/assets.ts
+++ b/packages/core/data-transfer/src/strapi/providers/local-source/assets.ts
@@ -62,8 +62,8 @@ function getFileStats(filepath: string, isLocal = false): Promise<{ size: number
 export const createAssetsStream = (strapi: LoadedStrapi): Duplex => {
   const generator: () => AsyncGenerator<IAsset, void> = async function* () {
     const stream: Readable = strapi.db
+      .queryBuilder('plugin::upload.file')
       // Create a query builder instance (default type is 'select')
-      ?.queryBuilder('plugin::upload.file')
       // Fetch all columns
       .select('*')
       // Get a readable stream
diff --git a/packages/core/data-transfer/src/strapi/queries/entity.ts b/packages/core/data-transfer/src/strapi/queries/entity.ts
index c2f3bfaded..82b9589204 100644
--- a/packages/core/data-transfer/src/strapi/queries/entity.ts
+++ b/packages/core/data-transfer/src/strapi/queries/entity.ts
@@ -22,10 +22,7 @@ const createEntityQuery = (strapi: LoadedStrapi): any => {
     async assignToEntity(uid: Common.UID.Schema, data: any) {
       const model = strapi.getModel(uid);
 
-      const entityComponents = await componentsService.createComponents(
-        uid as Common.UID.Schema,
-        data
-      );
+      const entityComponents = await componentsService.createComponents(uid, data);
       const dataWithoutComponents = sanitizeComponentLikeAttributes(model, data);
 
       return assign(entityComponents, dataWithoutComponents);
diff --git a/packages/core/strapi/src/commands/__tests__/commands.test.utils.ts b/packages/core/strapi/src/commands/__tests__/commands.test.utils.ts
index f4b8b5c0ff..6a948b86fc 100644
--- a/packages/core/strapi/src/commands/__tests__/commands.test.utils.ts
+++ b/packages/core/strapi/src/commands/__tests__/commands.test.utils.ts
@@ -1,3 +1,4 @@
+// TODO: move to a test-utils internal pkg
 import type { Utils } from '@strapi/typings';
 
 const expectExit = async (code: number, fn: Utils.Function.Any) => {
diff --git a/packages/core/typings/src/types/core-api/router.ts b/packages/core/typings/src/types/core-api/router.ts
index 947f0cae8f..6fdbe82d07 100644
--- a/packages/core/typings/src/types/core-api/router.ts
+++ b/packages/core/typings/src/types/core-api/router.ts
@@ -55,7 +55,7 @@ export type RouterConfig<TContentTypeUID extends Common.UID.ContentType> = {
     ],
     Generic
   >;
-  type: RouterType;
+  type?: RouterType;
 };
 
 export type RouterType = 'admin' | 'content-api';