diff --git a/app/layout.tsx b/app/layout.tsx
index 5386e3e..0c18e2c 100644
--- a/app/layout.tsx
+++ b/app/layout.tsx
@@ -1,10 +1,10 @@
+import { type ReactNode } from "react";
+import { type Metadata } from "next";
 import TopNav from "@azure-fundamentals/components/TopNav";
 import Footer from "../components/Footer";
-import { ReactNode } from "react";
-import { Metadata } from "next";
-import "styles/globals.css";
-import Script from "next/script";
 import ApolloProvider from "@azure-fundamentals/components/ApolloProvider";
+import { GoogleAnalytics, GoogleTagManager } from "@next/third-parties/google";
+import "styles/globals.css";
 
 export const metadata: Metadata = {
   metadataBase: new URL("http://localhost:3000"),
@@ -30,7 +30,9 @@ export default function RootLayout({ children }: RootLayoutProps) {
             {children}
             <Footer />
           </main>
-          <Script
+          <GoogleTagManager gtmId={GA_TRACKING_ID!} />
+          <GoogleAnalytics gaId={GA_TRACKING_ID!} />
+          {/*<Script
             src={
               "https://www.googletagmanager.com/gtag/js?id=" + GA_TRACKING_ID
             }
@@ -45,7 +47,7 @@ export default function RootLayout({ children }: RootLayoutProps) {
             page_path: window.location.pathname,
           });
         `}
-          </Script>
+        </Script>*/}
         </ApolloProvider>
       </body>
     </html>
diff --git a/package-lock.json b/package-lock.json
index f314d7e..a464d33 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,6 +11,7 @@
         "@apollo/client": "^3.7.9",
         "@as-integrations/next": "^3.0.0",
         "@azure/cosmos": "^3.17.2",
+        "@next/third-parties": "^14.1.3",
         "@types/node": "18.13.0",
         "@types/react": "^18.2.42",
         "@types/react-dom": "^18.2.17",
@@ -2101,6 +2102,18 @@
         "node": ">= 10"
       }
     },
+    "node_modules/@next/third-parties": {
+      "version": "14.1.3",
+      "resolved": "https://registry.npmjs.org/@next/third-parties/-/third-parties-14.1.3.tgz",
+      "integrity": "sha512-c3l0JnJzB5L2xXWK9DbH6nFpV1Z9vPFCiFan5l/pbwHjWGKxS8Q532MLAOW6EHB00vhCre8F/okBjGyPAGYpnw==",
+      "dependencies": {
+        "third-party-capital": "1.0.20"
+      },
+      "peerDependencies": {
+        "next": "^13.0.0 || ^14.0.0",
+        "react": "^18.2.0"
+      }
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -10113,6 +10126,11 @@
       "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
       "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
     },
+    "node_modules/third-party-capital": {
+      "version": "1.0.20",
+      "resolved": "https://registry.npmjs.org/third-party-capital/-/third-party-capital-1.0.20.tgz",
+      "integrity": "sha512-oB7yIimd8SuGptespDAZnNkzIz+NWaJCu2RMsbs4Wmp9zSDUM8Nhi3s2OOcqYuv3mN4hitXc8DVx+LyUmbUDiA=="
+    },
     "node_modules/tiny-glob": {
       "version": "0.2.9",
       "resolved": "https://registry.npmjs.org/tiny-glob/-/tiny-glob-0.2.9.tgz",
diff --git a/package.json b/package.json
index 430ff8e..3a1f482 100644
--- a/package.json
+++ b/package.json
@@ -18,6 +18,7 @@
     "@apollo/client": "^3.7.9",
     "@as-integrations/next": "^3.0.0",
     "@azure/cosmos": "^3.17.2",
+    "@next/third-parties": "^14.1.3",
     "@types/node": "18.13.0",
     "@types/react": "^18.2.42",
     "@types/react-dom": "^18.2.17",