diff --git a/vendor/magento/module-analytics/Model/Config/Backend/Baseurl/SubscriptionUpdateHandler.php b/vendor/magento/module-analytics/Model/Config/Backend/Baseurl/SubscriptionUpdateHandler.php
index 6e6f008d49f..1d845670346 100644
--- a/vendor/magento/module-analytics/Model/Config/Backend/Baseurl/SubscriptionUpdateHandler.php
+++ b/vendor/magento/module-analytics/Model/Config/Backend/Baseurl/SubscriptionUpdateHandler.php
@@ -24,7 +24,7 @@ class SubscriptionUpdateHandler
     /**
      * Config path for schedule setting of update handler.
      */
-    const UPDATE_CRON_STRING_PATH = "crontab/default/jobs/analytics_update/schedule/cron_expr";
+    const UPDATE_CRON_STRING_PATH = "crontab/analytics/jobs/analytics_update/schedule/cron_expr";
 
     /**
      * Flag code for the previous Base URL.
diff --git a/vendor/magento/module-analytics/Model/Config/Backend/CollectionTime.php b/vendor/magento/module-analytics/Model/Config/Backend/CollectionTime.php
index 524062eec35..58234f7912d 100644
--- a/vendor/magento/module-analytics/Model/Config/Backend/CollectionTime.php
+++ b/vendor/magento/module-analytics/Model/Config/Backend/CollectionTime.php
@@ -23,7 +23,7 @@ class CollectionTime extends Value
     /**
      * The path to config setting of schedule of collection data cron.
      */
-    const CRON_SCHEDULE_PATH = 'crontab/default/jobs/analytics_collect_data/schedule/cron_expr';
+    const CRON_SCHEDULE_PATH = 'crontab/analytics/jobs/analytics_collect_data/schedule/cron_expr';
 
     /**
      * @var WriterInterface
diff --git a/vendor/magento/module-analytics/Model/Config/Backend/Enabled/SubscriptionHandler.php b/vendor/magento/module-analytics/Model/Config/Backend/Enabled/SubscriptionHandler.php
index 4b125949948..12a9f9c5822 100644
--- a/vendor/magento/module-analytics/Model/Config/Backend/Enabled/SubscriptionHandler.php
+++ b/vendor/magento/module-analytics/Model/Config/Backend/Enabled/SubscriptionHandler.php
@@ -24,7 +24,7 @@ class SubscriptionHandler
     /**
      * Config path for schedule setting of subscription handler.
      */
-    const CRON_STRING_PATH = 'crontab/default/jobs/analytics_subscribe/schedule/cron_expr';
+    const CRON_STRING_PATH = 'crontab/analytics/jobs/analytics_subscribe/schedule/cron_expr';
 
     /**
      * Config value for schedule setting of subscription handler.
diff --git a/vendor/magento/module-analytics/etc/cron_groups.xml b/vendor/magento/module-analytics/etc/cron_groups.xml
new file mode 100644
index 00000000000..33f9677e714
--- /dev/null
+++ b/vendor/magento/module-analytics/etc/cron_groups.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Cron:etc/cron_groups.xsd">
+    <group id="analytics">
+        <schedule_generate_every>15</schedule_generate_every>
+        <schedule_ahead_for>20</schedule_ahead_for>
+        <schedule_lifetime>15</schedule_lifetime>
+        <history_cleanup_every>10</history_cleanup_every>
+        <history_success_lifetime>60</history_success_lifetime>
+        <history_failure_lifetime>4320</history_failure_lifetime>
+        <use_separate_process>1</use_separate_process>
+    </group>
+</config>
diff --git a/vendor/magento/module-analytics/etc/crontab.xml b/vendor/magento/module-analytics/etc/crontab.xml
index a4beef03595..a1825e4a291 100644
--- a/vendor/magento/module-analytics/etc/crontab.xml
+++ b/vendor/magento/module-analytics/etc/crontab.xml
@@ -5,8 +5,8 @@
  * See COPYING.txt for license details.
  */
 -->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Cron:etc/crontab.xsd">
-    <group id="default">
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Analytics:etc/crontab.xsd">
+    <group id="analytics">
         <job name="analytics_subscribe" instance="Magento\Analytics\Cron\SignUp" method="execute" />
         <job name="analytics_update" instance="Magento\Analytics\Cron\Update" method="execute" />
         <job name="analytics_collect_data" instance="Magento\Analytics\Cron\CollectData" method="execute" />
diff --git a/vendor/magento/module-analytics/etc/di.xml b/vendor/magento/module-analytics/etc/di.xml
index b9bb9cc9ff0..890d0c184c7 100644
--- a/vendor/magento/module-analytics/etc/di.xml
+++ b/vendor/magento/module-analytics/etc/di.xml
@@ -266,9 +266,9 @@
                 <item name="analytics/general/token" xsi:type="string">1</item>
             </argument>
             <argument name="environment" xsi:type="array">
-                <item name="crontab/default/jobs/analytics_collect_data/schedule/cron_expr" xsi:type="string">1</item>
-                <item name="crontab/default/jobs/analytics_update/schedule/cron_expr" xsi:type="string">1</item>
-                <item name="crontab/default/jobs/analytics_subscribe/schedule/cron_expr" xsi:type="string">1</item>
+                <item name="crontab/analytics/jobs/analytics_collect_data/schedule/cron_expr" xsi:type="string">1</item>
+                <item name="crontab/analytics/jobs/analytics_update/schedule/cron_expr" xsi:type="string">1</item>
+                <item name="crontab/analytics/jobs/analytics_subscribe/schedule/cron_expr" xsi:type="string">1</item>
             </argument>
         </arguments>
     </type>