diff --git a/packages/docusaurus-migrate/src/__tests__/__fixtures__/expectedSiteConfig.js b/packages/docusaurus-migrate/src/__tests__/__fixtures__/expectedSiteConfig.js
index beca10e789..b3680fa40a 100644
--- a/packages/docusaurus-migrate/src/__tests__/__fixtures__/expectedSiteConfig.js
+++ b/packages/docusaurus-migrate/src/__tests__/__fixtures__/expectedSiteConfig.js
@@ -43,6 +43,7 @@ module.exports = {
         },
         blog: {},
         theme: {},
+        googleAnalytics: {trackingID: 'UA-44373548-31'},
       },
     ],
   ],
@@ -78,6 +79,5 @@ module.exports = {
       indexName: 'docusaurus',
       algoliaOptions: {facetFilters: ['language:LANGUAGE', 'version:VERSION']},
     },
-    gtag: {trackingID: 'UA-44373548-31'},
   },
 };
diff --git a/packages/docusaurus-migrate/src/index.ts b/packages/docusaurus-migrate/src/index.ts
index d184376e40..d6e45d0ffb 100644
--- a/packages/docusaurus-migrate/src/index.ts
+++ b/packages/docusaurus-migrate/src/index.ts
@@ -247,6 +247,7 @@ export function createConfigFile({
       'enableUpdateBy',
       'docsSideNavCollapsible',
       'gaTrackingId',
+      'gaGtag',
     ];
     const value = siteConfig[key as keyof typeof siteConfig];
     if (value !== undefined && !knownFields.includes(key)) {
@@ -293,6 +294,15 @@ export function createConfigFile({
           },
           blog: {},
           theme: {},
+          ...(() => {
+            if (siteConfig.gaTrackingId) {
+              if (siteConfig.gaGtag) {
+                return {gtag: {trackingID: siteConfig.gaTrackingId}};
+              }
+              return {googleAnalytics: {trackingID: siteConfig.gaTrackingId}};
+            }
+            return undefined;
+          })(),
         },
       ],
     ],
@@ -351,11 +361,6 @@ export function createConfigFile({
         },
       },
       algolia: siteConfig.algolia ? siteConfig.algolia : undefined,
-      gtag: siteConfig.gaTrackingId
-        ? {
-            trackingID: siteConfig.gaTrackingId,
-          }
-        : undefined,
     },
   };
 }
diff --git a/packages/docusaurus-migrate/src/types.ts b/packages/docusaurus-migrate/src/types.ts
index a70fe63d39..1da3391895 100644
--- a/packages/docusaurus-migrate/src/types.ts
+++ b/packages/docusaurus-migrate/src/types.ts
@@ -18,6 +18,8 @@ export type Data = {
 export type ClassicPresetEntries = {
   docs: {[key: string]: unknown};
   blog: {[key: string]: unknown};
+  gtag?: {trackingID: string} | undefined;
+  googleAnalytics?: {trackingID: string} | undefined;
   theme: {[key: string]: unknown};
 };
 
@@ -51,9 +53,6 @@ export interface VersionTwoConfig {
   themes?: [];
   presets: [[string, ClassicPresetEntries]];
   themeConfig: {
-    gtag?: {
-      trackingID?: string;
-    };
     navbar: {
       title?: string;
       logo?: {
@@ -120,6 +119,7 @@ export type VersionOneConfig = {
   translationRecruitingLink?: string;
   algolia?: Record<string, unknown>;
   gaTrackingId?: string;
+  gaGtag?: boolean;
   highlight?: Record<string, unknown>;
   markdownPlugins?: Array<() => void>;
   scripts?: Array<{src: string; [key: string]: unknown} | string>;
diff --git a/website/docs/migration/migration-manual.md b/website/docs/migration/migration-manual.md
index 6b3faa7d60..93062fb76f 100644
--- a/website/docs/migration/migration-manual.md
+++ b/website/docs/migration/migration-manual.md
@@ -363,29 +363,43 @@ module.exports = {
 
 #### `gaTrackingId` {#gatrackingid}
 
-```js {5} title="docusaurus.config.js"
+```js title="docusaurus.config.js"
 module.exports = {
   // ...
-  themeConfig: {
-    googleAnalytics: {
-      trackingID: 'UA-141789564-1',
-    },
-    // ...
-  },
+  presets: [
+    [
+      '@docusaurus/preset-classic',
+      {
+        // ...
+        // highlight-start
+        googleAnalytics: {
+          trackingID: 'UA-141789564-1',
+        },
+        // highlight-end
+      },
+    ],
+  ],
 };
 ```
 
 #### `gaGtag` {#gagtag}
 
-```js {5} title="docusaurus.config.js"
+```js title="docusaurus.config.js"
 module.exports = {
   // ...
-  themeConfig: {
-    gtag: {
-      trackingID: 'UA-141789564-1',
-    },
-    // ...
-  },
+  presets: [
+    [
+      '@docusaurus/preset-classic',
+      {
+        // ...
+        // highlight-start
+        gtag: {
+          trackingID: 'UA-141789564-1',
+        },
+        // highlight-end
+      },
+    ],
+  ],
 };
 ```
 
diff --git a/website/versioned_docs/version-2.0.0-beta.14/migration/migration-manual.md b/website/versioned_docs/version-2.0.0-beta.14/migration/migration-manual.md
index ca2f18eff3..19ddb74117 100644
--- a/website/versioned_docs/version-2.0.0-beta.14/migration/migration-manual.md
+++ b/website/versioned_docs/version-2.0.0-beta.14/migration/migration-manual.md
@@ -363,29 +363,43 @@ module.exports = {
 
 #### `gaTrackingId` {#gatrackingid}
 
-```jsx {5} title="docusaurus.config.js"
+```js title="docusaurus.config.js"
 module.exports = {
   // ...
-  themeConfig: {
-    googleAnalytics: {
-      trackingID: 'UA-141789564-1',
-    },
-    // ...
-  },
+  presets: [
+    [
+      '@docusaurus/preset-classic',
+      {
+        // ...
+        // highlight-start
+        googleAnalytics: {
+          trackingID: 'UA-141789564-1',
+        },
+        // highlight-end
+      },
+    ],
+  ],
 };
 ```
 
 #### `gaGtag` {#gagtag}
 
-```jsx {5} title="docusaurus.config.js"
+```js title="docusaurus.config.js"
 module.exports = {
   // ...
-  themeConfig: {
-    gtag: {
-      trackingID: 'UA-141789564-1',
-    },
-    // ...
-  },
+  presets: [
+    [
+      '@docusaurus/preset-classic',
+      {
+        // ...
+        // highlight-start
+        gtag: {
+          trackingID: 'UA-141789564-1',
+        },
+        // highlight-end
+      },
+    ],
+  ],
 };
 ```