diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4ef27f04b166..d40eca468ea7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -22942,34 +22942,34 @@ importers:
   sdk/notificationhubs/notification-hubs:
     dependencies:
       '@azure-rest/core-client':
-        specifier: ^2.3.3
+        specifier: workspace:^
         version: link:../../core/core-client-rest
       '@azure/abort-controller':
-        specifier: ^2.1.2
+        specifier: workspace:^
         version: link:../../core/abort-controller
       '@azure/core-auth':
-        specifier: ^1.9.0
+        specifier: workspace:^
         version: link:../../core/core-auth
       '@azure/core-lro':
-        specifier: ^3.1.0
+        specifier: workspace:^
         version: link:../../core/core-lro
       '@azure/core-paging':
-        specifier: ^1.6.2
+        specifier: workspace:^
         version: link:../../core/core-paging
       '@azure/core-rest-pipeline':
         specifier: link:../../core/core-rest-pipeline
         version: link:../../core/core-rest-pipeline
       '@azure/core-tracing':
-        specifier: ^1.1.2
+        specifier: workspace:^
         version: link:../../core/core-tracing
       '@azure/core-util':
-        specifier: ^1.11.0
+        specifier: workspace:^
         version: link:../../core/core-util
       '@azure/core-xml':
-        specifier: ^1.4.4
+        specifier: workspace:^
         version: link:../../core/core-xml
       '@azure/logger':
-        specifier: ^1.1.2
+        specifier: workspace:^
         version: link:../../core/logger
       tslib:
         specifier: ^2.8.1
diff --git a/sdk/notificationhubs/notification-hubs/package.json b/sdk/notificationhubs/notification-hubs/package.json
index a11fda15b65b..72bb4c4461e8 100644
--- a/sdk/notificationhubs/notification-hubs/package.json
+++ b/sdk/notificationhubs/notification-hubs/package.json
@@ -85,16 +85,16 @@
     "vitest": "catalog:testing"
   },
   "dependencies": {
-    "@azure-rest/core-client": "^2.3.3",
-    "@azure/abort-controller": "^2.1.2",
-    "@azure/core-auth": "^1.9.0",
-    "@azure/core-lro": "^3.1.0",
-    "@azure/core-paging": "^1.6.2",
-    "@azure/core-rest-pipeline": "^1.19.0",
-    "@azure/core-tracing": "^1.1.2",
-    "@azure/core-util": "^1.11.0",
-    "@azure/core-xml": "^1.4.4",
-    "@azure/logger": "^1.1.2",
+    "@azure-rest/core-client": "workspace:^",
+    "@azure/abort-controller": "workspace:^",
+    "@azure/core-auth": "workspace:^",
+    "@azure/core-lro": "workspace:^",
+    "@azure/core-paging": "workspace:^",
+    "@azure/core-rest-pipeline": "workspace:^",
+    "@azure/core-tracing": "workspace:^",
+    "@azure/core-util": "workspace:^",
+    "@azure/core-xml": "workspace:^",
+    "@azure/logger": "workspace:^",
     "tslib": "^2.8.1"
   },
   "exports": {
diff --git a/sdk/notificationhubs/notification-hubs/samples/v2/javascript/README.md b/sdk/notificationhubs/notification-hubs/samples/v2/javascript/README.md
index 2dfb8c28fcf9..181d33ab708b 100644
--- a/sdk/notificationhubs/notification-hubs/samples/v2/javascript/README.md
+++ b/sdk/notificationhubs/notification-hubs/samples/v2/javascript/README.md
@@ -59,10 +59,10 @@ npm install
 node createInstallation.fcmLegacy.js
 ```
 
-Alternatively, run a single sample with the correct environment variables set (setting up the `.env` file is not required if you do this), for example (cross-platform):
+Alternatively, run a single sample with the required environment variables set (setting up the `.env` file is not required if you do this), for example (cross-platform):
 
 ```bash
-cross-env NOTIFICATIONHUBS_CONNECTION_STRING="<notificationhubs connection string>" NOTIFICATION_HUB_NAME="<notification hub name>" FCM_REGISTRATION_ID="<fcm registration id>" node createInstallation.fcmLegacy.js
+npx cross-env NOTIFICATIONHUBS_CONNECTION_STRING="<notificationhubs connection string>" NOTIFICATION_HUB_NAME="<notification hub name>" FCM_REGISTRATION_ID="<fcm registration id>" node createInstallation.fcmLegacy.js
 ```
 
 ## Next Steps
diff --git a/sdk/notificationhubs/notification-hubs/samples/v2/javascript/createInstallation.fcmV1.js b/sdk/notificationhubs/notification-hubs/samples/v2/javascript/createInstallation.fcmV1.js
index 1d457ac651f2..86db888aaf84 100644
--- a/sdk/notificationhubs/notification-hubs/samples/v2/javascript/createInstallation.fcmV1.js
+++ b/sdk/notificationhubs/notification-hubs/samples/v2/javascript/createInstallation.fcmV1.js
@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+
 /**
  * This sample demonstrates how the createOrUpdateInstallation() method can be used to create or overwrite an
  * installation in place.
diff --git a/sdk/notificationhubs/notification-hubs/samples/v2/javascript/exportRegistrationsJob.polling.js b/sdk/notificationhubs/notification-hubs/samples/v2/javascript/exportRegistrationsJob.polling.js
index 4635e2666a46..15df6ca8a4a1 100644
--- a/sdk/notificationhubs/notification-hubs/samples/v2/javascript/exportRegistrationsJob.polling.js
+++ b/sdk/notificationhubs/notification-hubs/samples/v2/javascript/exportRegistrationsJob.polling.js
@@ -17,7 +17,6 @@ const {
   beginSubmitNotificationHubJob,
   createClientContext,
 } = require("@azure/notification-hubs/api");
-
 // Define connection string and hub name
 const connectionString = process.env.NOTIFICATIONHUBS_CONNECTION_STRING || "<connection string>";
 const hubName = process.env.NOTIFICATION_HUB_NAME || "<hub name>";
diff --git a/sdk/notificationhubs/notification-hubs/samples/v2/javascript/importRegistrationsJob.js b/sdk/notificationhubs/notification-hubs/samples/v2/javascript/importRegistrationsJob.js
index f4fb8456a878..71aaffe0ac1d 100644
--- a/sdk/notificationhubs/notification-hubs/samples/v2/javascript/importRegistrationsJob.js
+++ b/sdk/notificationhubs/notification-hubs/samples/v2/javascript/importRegistrationsJob.js
@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+
 /**
  * This sample demonstrates how the createNotificationJob() method can be used to import registrations
  * descriptions from an existing set of exports.
diff --git a/sdk/notificationhubs/notification-hubs/samples/v2/javascript/importRegistrationsJob.poller.js b/sdk/notificationhubs/notification-hubs/samples/v2/javascript/importRegistrationsJob.poller.js
index 472d3ddc82ee..8d5fb4858686 100644
--- a/sdk/notificationhubs/notification-hubs/samples/v2/javascript/importRegistrationsJob.poller.js
+++ b/sdk/notificationhubs/notification-hubs/samples/v2/javascript/importRegistrationsJob.poller.js
@@ -17,7 +17,6 @@ const {
   beginSubmitNotificationHubJob,
   createClientContext,
 } = require("@azure/notification-hubs/api");
-
 // Define connection string and hub name
 const connectionString = process.env.NOTIFICATIONHUBS_CONNECTION_STRING || "<connection string>";
 const hubName = process.env.NOTIFICATION_HUB_NAME || "<hub name>";
diff --git a/sdk/notificationhubs/notification-hubs/samples/v2/javascript/package.json b/sdk/notificationhubs/notification-hubs/samples/v2/javascript/package.json
index 983da233a269..08a6e26e118a 100644
--- a/sdk/notificationhubs/notification-hubs/samples/v2/javascript/package.json
+++ b/sdk/notificationhubs/notification-hubs/samples/v2/javascript/package.json
@@ -25,7 +25,10 @@
   "dependencies": {
     "@azure/notification-hubs": "latest",
     "dotenv": "latest",
-    "@azure/core-util": "^1.11.0",
-    "@azure/core-rest-pipeline": "^1.19.0"
+    "@azure/core-util": "latest",
+    "@azure/core-rest-pipeline": "latest"
+  },
+  "devDependencies": {
+    "cross-env": "latest"
   }
 }
diff --git a/sdk/notificationhubs/notification-hubs/samples/v2/javascript/updateRegistration.js b/sdk/notificationhubs/notification-hubs/samples/v2/javascript/updateRegistration.js
index 4145a8422417..2a2c0c32870f 100644
--- a/sdk/notificationhubs/notification-hubs/samples/v2/javascript/updateRegistration.js
+++ b/sdk/notificationhubs/notification-hubs/samples/v2/javascript/updateRegistration.js
@@ -36,7 +36,7 @@ async function main() {
     registration.tags = [];
   }
 
-  await registration.tags.push("likes_sports");
+  registration.tags.push("likes_sports");
 
   const registrationResponse = await updateRegistration(context, registration);
 
diff --git a/sdk/notificationhubs/notification-hubs/samples/v2/typescript/README.md b/sdk/notificationhubs/notification-hubs/samples/v2/typescript/README.md
index 1966e36b2d16..4d321ffb8364 100644
--- a/sdk/notificationhubs/notification-hubs/samples/v2/typescript/README.md
+++ b/sdk/notificationhubs/notification-hubs/samples/v2/typescript/README.md
@@ -71,10 +71,10 @@ npm run build
 node dist/createInstallation.fcmLegacy.js
 ```
 
-Alternatively, run a single sample with the correct environment variables set (setting up the `.env` file is not required if you do this), for example (cross-platform):
+Alternatively, run a single sample with the required environment variables set (setting up the `.env` file is not required if you do this), for example (cross-platform):
 
 ```bash
-cross-env NOTIFICATIONHUBS_CONNECTION_STRING="<notificationhubs connection string>" NOTIFICATION_HUB_NAME="<notification hub name>" FCM_REGISTRATION_ID="<fcm registration id>" node dist/createInstallation.fcmLegacy.js
+npx cross-env NOTIFICATIONHUBS_CONNECTION_STRING="<notificationhubs connection string>" NOTIFICATION_HUB_NAME="<notification hub name>" FCM_REGISTRATION_ID="<fcm registration id>" node dist/createInstallation.fcmLegacy.js
 ```
 
 ## Next Steps
diff --git a/sdk/notificationhubs/notification-hubs/samples/v2/typescript/package.json b/sdk/notificationhubs/notification-hubs/samples/v2/typescript/package.json
index a76c46ae5197..e0d64a44730c 100644
--- a/sdk/notificationhubs/notification-hubs/samples/v2/typescript/package.json
+++ b/sdk/notificationhubs/notification-hubs/samples/v2/typescript/package.json
@@ -29,12 +29,13 @@
   "dependencies": {
     "@azure/notification-hubs": "latest",
     "dotenv": "latest",
-    "@azure/core-util": "^1.11.0",
-    "@azure/core-rest-pipeline": "^1.19.0"
+    "@azure/core-util": "latest",
+    "@azure/core-rest-pipeline": "latest"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",
-    "typescript": "~5.8.2",
-    "rimraf": "latest"
+    "cross-env": "latest",
+    "rimraf": "latest",
+    "typescript": "~6.0.2"
   }
 }
diff --git a/sdk/notificationhubs/notification-hubs/samples/v2/typescript/src/createInstallation.fcmV1.ts b/sdk/notificationhubs/notification-hubs/samples/v2/typescript/src/createInstallation.fcmV1.ts
index 1e436729f890..62a4d232d42b 100644
--- a/sdk/notificationhubs/notification-hubs/samples/v2/typescript/src/createInstallation.fcmV1.ts
+++ b/sdk/notificationhubs/notification-hubs/samples/v2/typescript/src/createInstallation.fcmV1.ts
@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+
 /**
  * This sample demonstrates how the createOrUpdateInstallation() method can be used to create or overwrite an
  * installation in place.
diff --git a/sdk/notificationhubs/notification-hubs/samples/v2/typescript/src/exportRegistrationsJob.polling.ts b/sdk/notificationhubs/notification-hubs/samples/v2/typescript/src/exportRegistrationsJob.polling.ts
index a4430fb33367..1ac2e38a9c38 100644
--- a/sdk/notificationhubs/notification-hubs/samples/v2/typescript/src/exportRegistrationsJob.polling.ts
+++ b/sdk/notificationhubs/notification-hubs/samples/v2/typescript/src/exportRegistrationsJob.polling.ts
@@ -14,7 +14,7 @@
 
 import "dotenv/config";
 import { beginSubmitNotificationHubJob, createClientContext } from "@azure/notification-hubs/api";
-import { NotificationHubJob } from "@azure/notification-hubs/models";
+import type { NotificationHubJob, NotificationHubJobPoller } from "@azure/notification-hubs/models";
 
 // Define connection string and hub name
 const connectionString = process.env.NOTIFICATIONHUBS_CONNECTION_STRING || "<connection string>";
@@ -31,7 +31,10 @@ async function main(): Promise<void> {
     type: "ExportRegistrations",
   };
 
-  const poller = await beginSubmitNotificationHubJob(context, exportJob);
+  const poller = (await beginSubmitNotificationHubJob(
+    context,
+    exportJob,
+  )) as unknown as NotificationHubJobPoller;
   exportJob = await poller.pollUntilDone();
 
   console.log(`Notification Hub Job status: ${exportJob.status}`);
diff --git a/sdk/notificationhubs/notification-hubs/samples/v2/typescript/src/importRegistrationsJob.poller.ts b/sdk/notificationhubs/notification-hubs/samples/v2/typescript/src/importRegistrationsJob.poller.ts
index eb619c71d22c..a5f5e13cdd3d 100644
--- a/sdk/notificationhubs/notification-hubs/samples/v2/typescript/src/importRegistrationsJob.poller.ts
+++ b/sdk/notificationhubs/notification-hubs/samples/v2/typescript/src/importRegistrationsJob.poller.ts
@@ -14,7 +14,7 @@
 
 import "dotenv/config";
 import { beginSubmitNotificationHubJob, createClientContext } from "@azure/notification-hubs/api";
-import { NotificationHubJob } from "@azure/notification-hubs/models";
+import type { NotificationHubJob, NotificationHubJobPoller } from "@azure/notification-hubs/models";
 
 // Define connection string and hub name
 const connectionString = process.env.NOTIFICATIONHUBS_CONNECTION_STRING || "<connection string>";
@@ -33,7 +33,10 @@ async function main(): Promise<void> {
     type: "ImportCreateRegistrations",
   };
 
-  const poller = await beginSubmitNotificationHubJob(context, importJob);
+  const poller = (await beginSubmitNotificationHubJob(
+    context,
+    importJob,
+  )) as unknown as NotificationHubJobPoller;
   importJob = await poller.pollUntilDone();
 
   console.log(`Notification Hub Job status: ${importJob.status}`);
diff --git a/sdk/notificationhubs/notification-hubs/samples/v2/typescript/src/importRegistrationsJob.ts b/sdk/notificationhubs/notification-hubs/samples/v2/typescript/src/importRegistrationsJob.ts
index 7ae085a21383..82e4d8b0bb5b 100644
--- a/sdk/notificationhubs/notification-hubs/samples/v2/typescript/src/importRegistrationsJob.ts
+++ b/sdk/notificationhubs/notification-hubs/samples/v2/typescript/src/importRegistrationsJob.ts
@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+
 /**
  * This sample demonstrates how the createNotificationJob() method can be used to import registrations
  * descriptions from an existing set of exports.
diff --git a/sdk/notificationhubs/notification-hubs/samples/v2/typescript/src/updateRegistration.ts b/sdk/notificationhubs/notification-hubs/samples/v2/typescript/src/updateRegistration.ts
index 04ae4989fe18..313cda66af53 100644
--- a/sdk/notificationhubs/notification-hubs/samples/v2/typescript/src/updateRegistration.ts
+++ b/sdk/notificationhubs/notification-hubs/samples/v2/typescript/src/updateRegistration.ts
@@ -36,7 +36,7 @@ async function main(): Promise<void> {
     registration.tags = [];
   }
 
-  await registration.tags.push("likes_sports");
+  registration.tags.push("likes_sports");
 
   const registrationResponse = await updateRegistration(context, registration);
 
diff --git a/sdk/notificationhubs/notification-hubs/samples/v2/typescript/tsconfig.json b/sdk/notificationhubs/notification-hubs/samples/v2/typescript/tsconfig.json
index 400db87cf648..4f7c3f6e72dc 100644
--- a/sdk/notificationhubs/notification-hubs/samples/v2/typescript/tsconfig.json
+++ b/sdk/notificationhubs/notification-hubs/samples/v2/typescript/tsconfig.json
@@ -1,18 +1,22 @@
 {
   "compilerOptions": {
     "target": "ES2023",
-    "module": "commonjs",
-    "lib": [],
+    "module": "nodenext",
+    "lib": [
+      "ESNext"
+    ],
     "importHelpers": true,
-    "strict": true,
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true,
-    "moduleResolution": "node10",
-    "esModuleInterop": true,
+    "types": [
+      "node"
+    ],
     "outDir": "./dist",
-    "resolveJsonModule": true
+    "rootDir": "./src",
+    "resolveJsonModule": true,
+    "moduleResolution": "nodenext"
   },
   "include": [
     "./src"