diff --git a/examples/getstarted/package.json b/examples/getstarted/package.json
index 20fd014a86..6c513a4a4d 100644
--- a/examples/getstarted/package.json
+++ b/examples/getstarted/package.json
@@ -1,7 +1,7 @@
 {
   "name": "getstarted",
   "private": true,
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "A Strapi application.",
   "scripts": {
     "develop": "strapi develop",
@@ -12,25 +12,25 @@
     "strapi": "strapi"
   },
   "dependencies": {
-    "@strapi/admin": "3.6.6",
-    "@strapi/plugin-content-manager": "3.6.6",
-    "@strapi/plugin-content-type-builder": "3.6.6",
-    "@strapi/plugin-documentation": "3.6.6",
-    "@strapi/plugin-email": "3.6.6",
-    "@strapi/plugin-graphql": "3.6.6",
-    "@strapi/plugin-i18n": "3.6.6",
-    "@strapi/plugin-upload": "3.6.6",
-    "@strapi/plugin-users-permissions": "3.6.6",
-    "@strapi/provider-email-mailgun": "3.6.6",
-    "@strapi/provider-upload-aws-s3": "3.6.6",
-    "@strapi/provider-upload-cloudinary": "3.6.6",
-    "@strapi/strapi": "3.6.6",
-    "@strapi/utils": "3.6.6",
+    "@strapi/admin": "3.6.7",
+    "@strapi/plugin-content-manager": "3.6.7",
+    "@strapi/plugin-content-type-builder": "3.6.7",
+    "@strapi/plugin-documentation": "3.6.7",
+    "@strapi/plugin-email": "3.6.7",
+    "@strapi/plugin-graphql": "3.6.7",
+    "@strapi/plugin-i18n": "3.6.7",
+    "@strapi/plugin-upload": "3.6.7",
+    "@strapi/plugin-users-permissions": "3.6.7",
+    "@strapi/provider-email-mailgun": "3.6.7",
+    "@strapi/provider-upload-aws-s3": "3.6.7",
+    "@strapi/provider-upload-cloudinary": "3.6.7",
+    "@strapi/strapi": "3.6.7",
+    "@strapi/utils": "3.6.7",
     "lodash": "4.17.21",
     "mysql": "2.18.1",
     "pg": "8.6.0",
     "sqlite3": "5.0.2",
-    "strapi-middleware-views": "3.6.6"
+    "strapi-middleware-views": "3.6.7"
   },
   "strapi": {
     "uuid": "getstarted"
diff --git a/lerna.json b/lerna.json
index d9be575e91..8f289fe561 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "3.6.6",
+  "version": "3.6.7",
   "packages": [
     "packages/*",
     "examples/*"
diff --git a/packages/cli/create-strapi-app/package.json b/packages/cli/create-strapi-app/package.json
index e0878a41c5..6af0314233 100644
--- a/packages/cli/create-strapi-app/package.json
+++ b/packages/cli/create-strapi-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-strapi-app",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Generate a new Strapi application.",
   "license": "SEE LICENSE IN LICENSE",
   "homepage": "https://strapi.io",
@@ -21,7 +21,7 @@
     "inquirer": "8.1.0",
     "js-yaml": "4.1.0",
     "node-fetch": "^2.6.1",
-    "@strapi/generate-new": "3.6.6"
+    "@strapi/generate-new": "3.6.7"
   },
   "scripts": {
     "test": "echo \"no tests yet\""
diff --git a/packages/cli/create-strapi-starter/package.json b/packages/cli/create-strapi-starter/package.json
index aa0bc52e81..5f03e9775d 100644
--- a/packages/cli/create-strapi-starter/package.json
+++ b/packages/cli/create-strapi-starter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "create-strapi-starter",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Generate a new Strapi application.",
   "license": "SEE LICENSE IN LICENSE",
   "homepage": "https://strapi.io",
@@ -26,7 +26,7 @@
     "js-yaml": "4.1.0",
     "node-fetch": "^2.6.1",
     "ora": "5.4.0",
-    "@strapi/generate-new": "3.6.6",
+    "@strapi/generate-new": "3.6.7",
     "tar": "6.1.4"
   },
   "scripts": {
diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/PluginBanner/Wrapper.js b/packages/core/admin/admin/src/pages/MarketplacePage/MarketplaceBanner/Wrapper.js
similarity index 100%
rename from packages/core/admin/admin/src/pages/MarketplacePage/PluginBanner/Wrapper.js
rename to packages/core/admin/admin/src/pages/MarketplacePage/MarketplaceBanner/Wrapper.js
diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/PluginBanner/index.js b/packages/core/admin/admin/src/pages/MarketplacePage/MarketplaceBanner/index.js
similarity index 59%
rename from packages/core/admin/admin/src/pages/MarketplacePage/PluginBanner/index.js
rename to packages/core/admin/admin/src/pages/MarketplacePage/MarketplaceBanner/index.js
index db33e9612d..e59e3f7a02 100644
--- a/packages/core/admin/admin/src/pages/MarketplacePage/PluginBanner/index.js
+++ b/packages/core/admin/admin/src/pages/MarketplacePage/MarketplaceBanner/index.js
@@ -1,29 +1,32 @@
 import React from 'react';
 import { FormattedMessage, useIntl } from 'react-intl';
+import { useTracking } from '@strapi/helper-plugin';
 import Wrapper from './Wrapper';
 import LogoStrapi from '../../../assets/images/banner_strapi-rocket.png';
 
-const PluginBanner = () => {
+const MarketplaceBanner = () => {
   const { formatMessage } = useIntl();
+  const { trackUsage } = useTracking();
 
   return (
     <Wrapper>
       <img
         className="bannerImage"
         src={LogoStrapi}
-        alt={formatMessage({ id: 'app.components.PluginBanner.image.alt' })}
+        alt={formatMessage({ id: 'app.components.MarketplaceBanner.image.alt' })}
       />
       <div>
         <div>
-          <FormattedMessage id="app.components.PluginBanner" />
+          <FormattedMessage id="app.components.MarketplaceBanner" />
         </div>
         <a
           href="https://github.com/strapi/awesome-strapi"
           target="_blank"
           rel="noopener noreferrer"
           className="bannerLink"
+          onClick={() => trackUsage('didGoToStrapiAwesome')}
         >
-          <FormattedMessage id="app.components.PluginBanner.link" />
+          <FormattedMessage id="app.components.MarketplaceBanner.link" />
           <i className="fa fa-external-link-alt" />
         </a>
       </div>
@@ -31,4 +34,4 @@ const PluginBanner = () => {
   );
 };
 
-export default PluginBanner;
+export default MarketplaceBanner;
diff --git a/packages/core/admin/admin/src/pages/MarketplacePage/index.js b/packages/core/admin/admin/src/pages/MarketplacePage/index.js
index d934ff8406..c67b570a31 100644
--- a/packages/core/admin/admin/src/pages/MarketplacePage/index.js
+++ b/packages/core/admin/admin/src/pages/MarketplacePage/index.js
@@ -15,7 +15,7 @@ import { useFetchPluginsFromMarketPlace } from '../../hooks';
 import PageTitle from '../../components/PageTitle';
 import PluginCard from './PluginCard';
 import Wrapper from './Wrapper';
-import PluginBanner from './PluginBanner';
+import MarketplaceBanner from './MarketplaceBanner';
 
 const MarketPlacePage = () => {
   const toggleNotification = useNotification();
@@ -91,7 +91,7 @@ const MarketPlacePage = () => {
             id: 'app.components.InstallPluginPage.description',
           })}
         />
-        <PluginBanner />
+        <MarketplaceBanner />
         <div className="row" style={{ paddingTop: '4.1rem' }}>
           {data.map(plugin => {
             return (
diff --git a/packages/core/admin/admin/src/translations/en.json b/packages/core/admin/admin/src/translations/en.json
index 8bd04e6fb5..7469b198c1 100644
--- a/packages/core/admin/admin/src/translations/en.json
+++ b/packages/core/admin/admin/src/translations/en.json
@@ -231,9 +231,9 @@
   "app.components.Official": "Official",
   "app.components.Onboarding.label.completed": "% completed",
   "app.components.Onboarding.title": "Get Started Videos",
-  "app.components.PluginBanner": "Discover plugins built by the community, and many more awesome things to kickstart your project, on Strapi Awesome.",
-  "app.components.PluginBanner.image.alt": "a strapi rocket logo",
-  "app.components.PluginBanner.link": "Check it out now",
+  "app.components.MarketplaceBanner": "Discover plugins built by the community, and many more awesome things to kickstart your project, on Strapi Awesome.",
+  "app.components.MarketplaceBanner.image.alt": "a strapi rocket logo",
+  "app.components.MarketplaceBanner.link": "Check it out now",
   "app.components.PluginCard.Button.label.download": "Download",
   "app.components.PluginCard.Button.label.install": "Already installed",
   "app.components.PluginCard.PopUpWarning.install.impossible.autoReload.needed": "The autoReload feature needs to be enabled. Please start your app with `yarn develop`.",
diff --git a/packages/core/admin/ee/middlewares/features-routes/routes.js b/packages/core/admin/ee/middlewares/features-routes/routes.js
index 8d4b63fa1b..249bfde4f8 100644
--- a/packages/core/admin/ee/middlewares/features-routes/routes.js
+++ b/packages/core/admin/ee/middlewares/features-routes/routes.js
@@ -12,6 +12,11 @@ module.exports = {
       path: '/connect/:provider',
       handler: 'authentication.providerLogin',
     },
+    {
+      method: 'POST',
+      path: '/connect/:provider',
+      handler: 'authentication.providerLogin',
+    },
     {
       method: 'GET',
       path: '/providers/options',
diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json
index e4254063e8..1f025d45e2 100644
--- a/packages/core/admin/package.json
+++ b/packages/core/admin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -39,8 +39,8 @@
     "@fortawesome/free-solid-svg-icons": "^5.15.3",
     "@fortawesome/react-fontawesome": "^0.1.14",
     "@strapi/babel-plugin-switch-ee-ce": "1.0.0",
-    "@strapi/helper-plugin": "3.6.6",
-    "@strapi/utils": "3.6.6",
+    "@strapi/helper-plugin": "3.6.7",
+    "@strapi/utils": "3.6.7",
     "axios": "^0.21.1",
     "babel-loader": "8.2.2",
     "babel-plugin-styled-components": "1.12.0",
diff --git a/packages/core/content-manager/package.json b/packages/core/content-manager/package.json
index a7f680764c..fd97888886 100644
--- a/packages/core/content-manager/package.json
+++ b/packages/core/content-manager/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-content-manager",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "A powerful UI to easily manage your data.",
   "strapi": {
     "icon": "plug",
@@ -12,8 +12,8 @@
   },
   "dependencies": {
     "@sindresorhus/slugify": "1.1.0",
-    "@strapi/helper-plugin": "3.6.6",
-    "@strapi/utils": "3.6.6",
+    "@strapi/helper-plugin": "3.6.7",
+    "@strapi/utils": "3.6.7",
     "lodash": "4.17.21",
     "pluralize": "^8.0.0",
     "yup": "^0.32.9"
diff --git a/packages/core/content-type-builder/package.json b/packages/core/content-type-builder/package.json
index eac7751ca9..11aea19510 100644
--- a/packages/core/content-type-builder/package.json
+++ b/packages/core/content-type-builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-content-type-builder",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Strapi plugin to create content type (API).",
   "strapi": {
     "name": "Content Type Builder",
@@ -10,10 +10,10 @@
   },
   "dependencies": {
     "@sindresorhus/slugify": "1.1.0",
-    "@strapi/generate": "3.6.6",
-    "@strapi/generate-api": "3.6.6",
-    "@strapi/helper-plugin": "3.6.6",
-    "@strapi/utils": "3.6.6",
+    "@strapi/generate": "3.6.7",
+    "@strapi/generate-api": "3.6.7",
+    "@strapi/helper-plugin": "3.6.7",
+    "@strapi/utils": "3.6.7",
     "fs-extra": "^9.1.0",
     "lodash": "4.17.21",
     "pluralize": "^8.0.0",
diff --git a/packages/core/database/package.json b/packages/core/database/package.json
index 102ae85388..687f8759c5 100644
--- a/packages/core/database/package.json
+++ b/packages/core/database/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/database",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Strapi's database layer",
   "homepage": "https://strapi.io",
   "main": "./lib/index.js",
diff --git a/packages/core/email/package.json b/packages/core/email/package.json
index 2087b28f19..016a306d10 100644
--- a/packages/core/email/package.json
+++ b/packages/core/email/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-email",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Easily configure your Strapi application to send emails.",
   "strapi": {
     "name": "Email",
@@ -14,12 +14,12 @@
   },
   "dependencies": {
     "lodash": "4.17.21",
-    "@strapi/provider-email-sendmail": "3.6.6",
-    "@strapi/utils": "3.6.6"
+    "@strapi/provider-email-sendmail": "3.6.7",
+    "@strapi/utils": "3.6.7"
   },
   "devDependencies": {
     "rimraf": "3.0.2",
-    "@strapi/helper-plugin": "3.6.6"
+    "@strapi/helper-plugin": "3.6.7"
   },
   "author": {
     "name": "Strapi team",
diff --git a/packages/core/helper-plugin/package.json b/packages/core/helper-plugin/package.json
index 384d5ec94d..4e5e402b78 100644
--- a/packages/core/helper-plugin/package.json
+++ b/packages/core/helper-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/helper-plugin",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Helper for Strapi plugins development",
   "main": "build/index.js",
   "module": "build/index.esm.js",
diff --git a/packages/core/strapi/lib/services/entity-service/index.js b/packages/core/strapi/lib/services/entity-service/index.js
index 9ec81ea1e5..f31dc22a1e 100644
--- a/packages/core/strapi/lib/services/entity-service/index.js
+++ b/packages/core/strapi/lib/services/entity-service/index.js
@@ -68,9 +68,8 @@ const createDefaultImplementation = ({ strapi, db, eventHub, entityValidator })
 
     const query = transformParamsToQuery(uid, params);
 
-    // return first element and ignore filters
     if (kind === 'singleType') {
-      return db.query(uid).findOne({});
+      return db.query(uid).findOne(query);
     }
 
     return db.query(uid).findMany(query);
diff --git a/packages/core/strapi/package.json b/packages/core/strapi/package.json
index 08c7fcf68f..9a91f6e654 100644
--- a/packages/core/strapi/package.json
+++ b/packages/core/strapi/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/strapi",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "An open source headless CMS solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier. Databases supported: MySQL, MariaDB, PostgreSQL, SQLite",
   "homepage": "https://strapi.io",
   "directories": {
@@ -13,18 +13,18 @@
   },
   "dependencies": {
     "@koa/cors": "^3.0.0",
-    "@strapi/admin": "3.6.6",
-    "@strapi/database": "3.6.6",
-    "@strapi/generate": "3.6.6",
-    "@strapi/generate-api": "3.6.6",
-    "@strapi/generate-controller": "3.6.6",
-    "@strapi/generate-model": "3.6.6",
-    "@strapi/generate-new": "3.6.6",
-    "@strapi/generate-plugin": "3.6.6",
-    "@strapi/generate-policy": "3.6.6",
-    "@strapi/generate-service": "3.6.6",
-    "@strapi/logger": "3.6.6",
-    "@strapi/utils": "3.6.6",
+    "@strapi/admin": "3.6.7",
+    "@strapi/database": "3.6.7",
+    "@strapi/generate": "3.6.7",
+    "@strapi/generate-api": "3.6.7",
+    "@strapi/generate-controller": "3.6.7",
+    "@strapi/generate-model": "3.6.7",
+    "@strapi/generate-new": "3.6.7",
+    "@strapi/generate-plugin": "3.6.7",
+    "@strapi/generate-policy": "3.6.7",
+    "@strapi/generate-service": "3.6.7",
+    "@strapi/logger": "3.6.7",
+    "@strapi/utils": "3.6.7",
     "async": "^2.1.2",
     "boom": "^7.3.0",
     "boxen": "4.2.0",
diff --git a/packages/core/upload/package.json b/packages/core/upload/package.json
index af7b1c9a4c..afa4ac4ccf 100644
--- a/packages/core/upload/package.json
+++ b/packages/core/upload/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-upload",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Makes it easy to upload images and files to your Strapi Application.",
   "strapi": {
     "displayName": "Media Library",
@@ -14,9 +14,9 @@
     "test": "echo \"no tests yet\""
   },
   "dependencies": {
-    "@strapi/helper-plugin": "3.6.6",
-    "@strapi/provider-upload-local": "3.6.6",
-    "@strapi/utils": "3.6.6",
+    "@strapi/helper-plugin": "3.6.7",
+    "@strapi/provider-upload-local": "3.6.7",
+    "@strapi/utils": "3.6.7",
     "byte-size": "^7.0.1",
     "cropperjs": "^1.5.11",
     "immer": "9.0.5",
diff --git a/packages/core/utils/package.json b/packages/core/utils/package.json
index bbf9072a70..1f8d514e2d 100644
--- a/packages/core/utils/package.json
+++ b/packages/core/utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/utils",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Shared utilities for the Strapi packages",
   "homepage": "https://strapi.io",
   "keywords": [
diff --git a/packages/generators/api/package.json b/packages/generators/api/package.json
index 83e7f1b305..73970100b0 100644
--- a/packages/generators/api/package.json
+++ b/packages/generators/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/generate-api",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Generate an API for a Strapi application.",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -15,7 +15,7 @@
   "dependencies": {
     "lodash": "4.17.21",
     "pluralize": "^8.0.0",
-    "@strapi/utils": "3.6.6"
+    "@strapi/utils": "3.6.7"
   },
   "scripts": {
     "test": "echo \"no tests yet\""
diff --git a/packages/generators/app/package.json b/packages/generators/app/package.json
index 270b68eae3..cba34fec23 100644
--- a/packages/generators/app/package.json
+++ b/packages/generators/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/generate-new",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Generate a new Strapi application.",
   "homepage": "https://strapi.io",
   "keywords": [
diff --git a/packages/generators/controller/package.json b/packages/generators/controller/package.json
index 0f78446772..21a12c4605 100644
--- a/packages/generators/controller/package.json
+++ b/packages/generators/controller/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/generate-controller",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Generate a controller for a Strapi API.",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "lodash": "4.17.21",
-    "@strapi/utils": "3.6.6"
+    "@strapi/utils": "3.6.7"
   },
   "scripts": {
     "test": "echo \"no tests yet\""
diff --git a/packages/generators/generate/package.json b/packages/generators/generate/package.json
index 70809d57ef..706ea8f8b4 100644
--- a/packages/generators/generate/package.json
+++ b/packages/generators/generate/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/generate",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Master of ceremonies for the Strapi generators.",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -20,7 +20,7 @@
     "fs-extra": "^9.1.0",
     "lodash": "4.17.21",
     "reportback": "^2.0.2",
-    "@strapi/utils": "3.6.6"
+    "@strapi/utils": "3.6.7"
   },
   "author": {
     "name": "Strapi team",
diff --git a/packages/generators/model/package.json b/packages/generators/model/package.json
index 63f10d5431..bfb4791d1b 100644
--- a/packages/generators/model/package.json
+++ b/packages/generators/model/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/generate-model",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Generate a model for a Strapi API.",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -16,7 +16,7 @@
   "dependencies": {
     "lodash": "4.17.21",
     "pluralize": "^8.0.0",
-    "@strapi/utils": "3.6.6"
+    "@strapi/utils": "3.6.7"
   },
   "scripts": {
     "test": "echo \"no tests yet\""
diff --git a/packages/generators/plugin/package.json b/packages/generators/plugin/package.json
index bed9ab65fc..fc78e19b91 100644
--- a/packages/generators/plugin/package.json
+++ b/packages/generators/plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/generate-plugin",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Generate an plugin for a Strapi application.",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -15,7 +15,7 @@
   "dependencies": {
     "fs-extra": "^9.1.0",
     "lodash": "4.17.21",
-    "@strapi/utils": "3.6.6"
+    "@strapi/utils": "3.6.7"
   },
   "scripts": {
     "test": "echo \"no tests yet\""
diff --git a/packages/generators/policy/package.json b/packages/generators/policy/package.json
index bed4dc1a09..3acc3e6917 100644
--- a/packages/generators/policy/package.json
+++ b/packages/generators/policy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/generate-policy",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Generate a policy for a Strapi API.",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "lodash": "4.17.21",
-    "@strapi/utils": "3.6.6"
+    "@strapi/utils": "3.6.7"
   },
   "scripts": {
     "test": "echo \"no tests yet\""
diff --git a/packages/generators/service/package.json b/packages/generators/service/package.json
index 86328ff682..32f234fa28 100644
--- a/packages/generators/service/package.json
+++ b/packages/generators/service/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/generate-service",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Generate a service for a Strapi API.",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "lodash": "4.17.21",
-    "@strapi/utils": "3.6.6"
+    "@strapi/utils": "3.6.7"
   },
   "scripts": {
     "test": "echo \"no tests yet\""
diff --git a/packages/plugins/documentation/package.json b/packages/plugins/documentation/package.json
index f4fe39deca..618886ff1d 100644
--- a/packages/plugins/documentation/package.json
+++ b/packages/plugins/documentation/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-documentation",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Create an OpenAPI Document and visualize your API with SWAGGER UI.",
   "strapi": {
     "displayName": "Documentation",
@@ -13,7 +13,7 @@
     "test": "echo \"no tests yet\""
   },
   "dependencies": {
-    "@strapi/helper-plugin": "3.6.6",
+    "@strapi/helper-plugin": "3.6.7",
     "cheerio": "^1.0.0-rc.5",
     "fs-extra": "^9.1.0",
     "koa-static": "^5.0.0",
diff --git a/packages/plugins/graphql/package.json b/packages/plugins/graphql/package.json
index 95d8e9c26d..9bc1a0b64d 100644
--- a/packages/plugins/graphql/package.json
+++ b/packages/plugins/graphql/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-graphql",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Adds GraphQL endpoint with default API methods.",
   "strapi": {
     "displayName": "GraphQL",
@@ -29,7 +29,7 @@
     "koa-compose": "^4.1.0",
     "lodash": "4.17.21",
     "pluralize": "^8.0.0",
-    "@strapi/utils": "3.6.6"
+    "@strapi/utils": "3.6.7"
   },
   "devDependencies": {
     "cross-env": "^7.0.3",
diff --git a/packages/plugins/i18n/package.json b/packages/plugins/i18n/package.json
index 0f46afa8fc..465428bcab 100644
--- a/packages/plugins/i18n/package.json
+++ b/packages/plugins/i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-i18n",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "This plugin enables to create, to read and to update content in different languages, both from the Admin Panel and from the API",
   "strapi": {
     "displayName": "Internationalization",
@@ -14,7 +14,7 @@
     "lodash": "4.17.20",
     "p-map": "4.0.0",
     "pluralize": "8.0.0",
-    "@strapi/utils": "3.6.6"
+    "@strapi/utils": "3.6.7"
   },
   "author": {
     "name": "A Strapi developer",
diff --git a/packages/plugins/i18n/server/services/__tests__/localizations.test.js b/packages/plugins/i18n/server/services/__tests__/localizations.test.js
index 0e8f1e7337..941748a107 100644
--- a/packages/plugins/i18n/server/services/__tests__/localizations.test.js
+++ b/packages/plugins/i18n/server/services/__tests__/localizations.test.js
@@ -173,9 +173,7 @@ describe('localizations service', () => {
       setGlobalStrapi();
 
       const update = jest.fn();
-      global.strapi.query = () => {
-        return { update };
-      };
+      global.strapi.entityService = { update };
 
       const entry = {
         id: 1,
@@ -188,7 +186,7 @@ describe('localizations service', () => {
       await syncNonLocalizedAttributes(entry, { model });
 
       expect(update).toHaveBeenCalledTimes(1);
-      expect(update).toHaveBeenCalledWith({ where: { id: 2 }, data: { stars: 1 } });
+      expect(update).toHaveBeenCalledWith(model.uid, 2, { data: { stars: 1 } });
     });
   });
 });
diff --git a/packages/plugins/i18n/server/services/localizations.js b/packages/plugins/i18n/server/services/localizations.js
index f2f03fb571..4b69305555 100644
--- a/packages/plugins/i18n/server/services/localizations.js
+++ b/packages/plugins/i18n/server/services/localizations.js
@@ -53,7 +53,7 @@ const syncNonLocalizedAttributes = async (entry, { model }) => {
     }
 
     const updateLocalization = id => {
-      return strapi.query(model.uid).update({ where: { id }, data: nonLocalizedAttributes });
+      return strapi.entityService.update(model.uid, id, { data: nonLocalizedAttributes });
     };
 
     await Promise.all(entry.localizations.map(({ id }) => updateLocalization(id)));
diff --git a/packages/plugins/sentry/package.json b/packages/plugins/sentry/package.json
index 2d99dedff6..1cb27ae799 100644
--- a/packages/plugins/sentry/package.json
+++ b/packages/plugins/sentry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-sentry",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Send Strapi error events to Sentry",
   "strapi": {
     "name": "Sentry",
diff --git a/packages/plugins/users-permissions/package.json b/packages/plugins/users-permissions/package.json
index 7e35748b08..4f45f04d11 100644
--- a/packages/plugins/users-permissions/package.json
+++ b/packages/plugins/users-permissions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/plugin-users-permissions",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Protect your API with a full-authentication process based on JWT",
   "strapi": {
     "displayName": "Roles & Permissions",
@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "@purest/providers": "^1.0.2",
-    "@strapi/helper-plugin": "3.6.6",
-    "@strapi/utils": "3.6.6",
+    "@strapi/helper-plugin": "3.6.7",
+    "@strapi/utils": "3.6.7",
     "bcryptjs": "^2.4.3",
     "grant-koa": "5.4.8",
     "jsonwebtoken": "^8.1.0",
diff --git a/packages/providers/email-amazon-ses/package.json b/packages/providers/email-amazon-ses/package.json
index 963567dda7..d0256fd26f 100644
--- a/packages/providers/email-amazon-ses/package.json
+++ b/packages/providers/email-amazon-ses/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/provider-email-amazon-ses",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Amazon SES provider for strapi email",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -15,7 +15,7 @@
   "main": "./lib",
   "dependencies": {
     "node-ses": "^3.0.3",
-    "@strapi/utils": "3.6.6"
+    "@strapi/utils": "3.6.7"
   },
   "author": {
     "email": "nikolay@tsenkov.net",
diff --git a/packages/providers/email-mailgun/package.json b/packages/providers/email-mailgun/package.json
index 87c05299e9..61ec55fd55 100644
--- a/packages/providers/email-mailgun/package.json
+++ b/packages/providers/email-mailgun/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/provider-email-mailgun",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Mailgun provider for strapi email plugin",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -14,7 +14,7 @@
   "main": "./lib",
   "dependencies": {
     "mailgun-js": "0.22.0",
-    "@strapi/utils": "3.6.6"
+    "@strapi/utils": "3.6.7"
   },
   "strapi": {
     "isProvider": true
diff --git a/packages/providers/email-nodemailer/package.json b/packages/providers/email-nodemailer/package.json
index cdf43024a2..c5a056a385 100644
--- a/packages/providers/email-nodemailer/package.json
+++ b/packages/providers/email-nodemailer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/provider-email-nodemailer",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Nodemailer provider for Strapi 3",
   "homepage": "https://strapi.io",
   "keywords": [
diff --git a/packages/providers/email-sendgrid/package.json b/packages/providers/email-sendgrid/package.json
index 28202b46f7..24e5b23980 100644
--- a/packages/providers/email-sendgrid/package.json
+++ b/packages/providers/email-sendgrid/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/provider-email-sendgrid",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Sendgrid provider for strapi email",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -14,7 +14,7 @@
   "main": "./lib",
   "dependencies": {
     "@sendgrid/mail": "6.4.0",
-    "@strapi/utils": "3.6.6"
+    "@strapi/utils": "3.6.7"
   },
   "strapi": {
     "isProvider": true
diff --git a/packages/providers/email-sendmail/package.json b/packages/providers/email-sendmail/package.json
index 9c6d7fdbde..c0103db2fb 100644
--- a/packages/providers/email-sendmail/package.json
+++ b/packages/providers/email-sendmail/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/provider-email-sendmail",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Sendmail provider for strapi email",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -13,7 +13,7 @@
   "main": "./lib",
   "dependencies": {
     "sendmail": "^1.6.1",
-    "@strapi/utils": "3.6.6"
+    "@strapi/utils": "3.6.7"
   },
   "strapi": {
     "isProvider": true
diff --git a/packages/providers/upload-aws-s3/package.json b/packages/providers/upload-aws-s3/package.json
index a2c86f681a..ec41115219 100644
--- a/packages/providers/upload-aws-s3/package.json
+++ b/packages/providers/upload-aws-s3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/provider-upload-aws-s3",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "AWS S3 provider for strapi upload",
   "homepage": "https://strapi.io",
   "keywords": [
diff --git a/packages/providers/upload-cloudinary/package.json b/packages/providers/upload-cloudinary/package.json
index 4803f8e8c0..ce641586de 100644
--- a/packages/providers/upload-cloudinary/package.json
+++ b/packages/providers/upload-cloudinary/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/provider-upload-cloudinary",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Cloudinary provider for strapi upload",
   "homepage": "https://strapi.io",
   "keywords": [
diff --git a/packages/providers/upload-local/package.json b/packages/providers/upload-local/package.json
index e50740ae28..e4c6d5c9ce 100644
--- a/packages/providers/upload-local/package.json
+++ b/packages/providers/upload-local/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/provider-upload-local",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Local provider for strapi upload",
   "homepage": "https://strapi.io",
   "keywords": [
diff --git a/packages/providers/upload-rackspace/package.json b/packages/providers/upload-rackspace/package.json
index 0f8875f57a..6819fcb550 100644
--- a/packages/providers/upload-rackspace/package.json
+++ b/packages/providers/upload-rackspace/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/provider-upload-rackspace",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Rackspace provider for strapi upload",
   "main": "./lib",
   "keywords": [],
diff --git a/packages/strapi-hook-ejs/package.json b/packages/strapi-hook-ejs/package.json
index f3cf669aad..74802b8b64 100644
--- a/packages/strapi-hook-ejs/package.json
+++ b/packages/strapi-hook-ejs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-hook-ejs",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "EJS hook for the Strapi framework",
   "homepage": "https://strapi.io",
   "keywords": [
diff --git a/packages/strapi-hook-redis/package.json b/packages/strapi-hook-redis/package.json
index 833191c05c..349760cc13 100644
--- a/packages/strapi-hook-redis/package.json
+++ b/packages/strapi-hook-redis/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-hook-redis",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Redis hook for the Strapi framework",
   "homepage": "https://strapi.io",
   "keywords": [
@@ -19,7 +19,7 @@
     "lodash": "4.17.21",
     "rimraf": "3.0.2",
     "stack-trace": "0.0.10",
-    "@strapi/utils": "3.6.6"
+    "@strapi/utils": "3.6.7"
   },
   "author": {
     "email": "hi@strapi.io",
diff --git a/packages/strapi-middleware-views/package.json b/packages/strapi-middleware-views/package.json
index 44f647c5a9..bddc43265c 100644
--- a/packages/strapi-middleware-views/package.json
+++ b/packages/strapi-middleware-views/package.json
@@ -1,6 +1,6 @@
 {
   "name": "strapi-middleware-views",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Views middleware to enable server-side rendering for the Strapi framework",
   "homepage": "https://strapi.io",
   "keywords": [
diff --git a/packages/utils/logger/package.json b/packages/utils/logger/package.json
index ee0703b69e..5e3fdfa68e 100644
--- a/packages/utils/logger/package.json
+++ b/packages/utils/logger/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@strapi/logger",
-  "version": "3.6.6",
+  "version": "3.6.7",
   "description": "Strapi's logger",
   "homepage": "https://strapi.io",
   "main": "./lib/index.js",