diff --git a/packages/core/admin/server/controllers/admin.js b/packages/core/admin/server/controllers/admin.js
index a550307d1b..531e2b81f2 100644
--- a/packages/core/admin/server/controllers/admin.js
+++ b/packages/core/admin/server/controllers/admin.js
@@ -94,13 +94,13 @@ module.exports = {
     const useTypescriptOnAdmin = await isUsingTypeScript(
       path.join(strapi.dirs.app.root, 'src', 'admin')
     );
-    const hostedOnStrapiCloud = env('STRAPI_HOSTING', null) === 'StrapiCloud';
+    const isHostedOnStrapiCloud = env.bool('STRAPI_CLOUD');
 
     return {
       data: {
         useTypescriptOnServer,
         useTypescriptOnAdmin,
-        hostedOnStrapiCloud,
+        isHostedOnStrapiCloud,
       },
     };
   },
diff --git a/packages/core/strapi/lib/services/metrics/sender.js b/packages/core/strapi/lib/services/metrics/sender.js
index c30b947b18..4805057b0d 100644
--- a/packages/core/strapi/lib/services/metrics/sender.js
+++ b/packages/core/strapi/lib/services/metrics/sender.js
@@ -55,7 +55,7 @@ module.exports = (strapi) => {
     projectType: isEE ? 'Enterprise' : 'Community',
     useTypescriptOnServer: isUsingTypeScriptSync(serverRootPath),
     useTypescriptOnAdmin: isUsingTypeScriptSync(adminRootPath),
-    hostedOnStrapiCloud: env('STRAPI_HOSTING', null) === 'StrapiCloud',
+    isHostedOnStrapiCloud: env.bool('STRAPI_CLOUD'),
   };
 
   addPackageJsonStrapiMetadata(anonymousMetadata, strapi);
diff --git a/packages/generators/app/lib/utils/usage.js b/packages/generators/app/lib/utils/usage.js
index ed0d49b249..9851177193 100644
--- a/packages/generators/app/lib/utils/usage.js
+++ b/packages/generators/app/lib/utils/usage.js
@@ -65,7 +65,7 @@ const getProperties = (scope, error) => ({
   useYarn: scope.useYarn,
   useTypescriptOnServer: scope.useTypescript,
   useTypescriptOnAdmin: scope.useTypescript,
-  hostedOnStrapiCloud: process.env.STRAPI_HOSTING === 'StrapiCloud',
+  isHostedOnStrapiCloud: process.env.STRAPI_CLOUD === 'true',
   noRun: (scope.runQuickstartApp !== true).toString(),
 });