diff --git a/cd-tekton-pipeline/v2.ts b/cd-tekton-pipeline/v2.ts
index 362d5f8..c1b3823 100644
--- a/cd-tekton-pipeline/v2.ts
+++ b/cd-tekton-pipeline/v2.ts
@@ -18,7 +18,7 @@
  * IBM OpenAPI SDK Code Generator Version: 3.112.0-f88e9264-20260220-115155
  */
 
-import * as extend from 'extend';
+import extend = require('extend');
 import { IncomingHttpHeaders, OutgoingHttpHeaders } from 'http';
 import {
   AbortSignal,
@@ -67,7 +67,7 @@ class CdTektonPipelineV2 extends BaseService {
    * if no mapping for the region exists
    */
   public static getServiceUrlForRegion(region: string): string {
-    return this._regionalEndpoints.get(region)
+    return this._regionalEndpoints.get(region) ?? '';
   }
 
   /*************************
diff --git a/cd-toolchain/v2.ts b/cd-toolchain/v2.ts
index 71f227c..c0f95c6 100644
--- a/cd-toolchain/v2.ts
+++ b/cd-toolchain/v2.ts
@@ -18,7 +18,7 @@
  * IBM OpenAPI SDK Code Generator Version: 3.96.0-d6dec9d7-20241008-212902
  */
 
-import * as extend from 'extend';
+import extend = require('extend');
 import { IncomingHttpHeaders, OutgoingHttpHeaders } from 'http';
 import {
   Authenticator,
@@ -56,7 +56,7 @@ class CdToolchainV2 extends BaseService {
    * if no mapping for the region exists
    */
   public static getServiceUrlForRegion(region: string): string {
-    return this._regionalEndpoints.get(region);
+    return this._regionalEndpoints.get(region) ?? '';
   }
 
   /*************************
@@ -1445,7 +1445,7 @@ namespace CdToolchainV2 {
       if (!this.pageContext.next) {
         this._hasNext = false;
       }
-      return result.toolchains;
+      return result.toolchains ?? [];
     }
 
     /**
diff --git a/package-lock.json b/package-lock.json
index cdc417d..4629517 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17,6 +17,7 @@
         "@eslint/js": "^9.39.3",
         "@ibm-cloud/sdk-test-utilities": "^1.0.0",
         "@masterodin/publisher": "^0.10.0",
+        "@types/extend": "^3.0.4",
         "dotenv": "^17.0.0",
         "eslint": "^9.39.3",
         "eslint-config-prettier": "^10.1.8",
@@ -28,7 +29,7 @@
         "installed-check": "^10.0.0",
         "jest": "^29.7.0",
         "nock": "^14.0.1",
-        "typescript": "^5.9.3",
+        "typescript": "^6.0.3",
         "typescript-eslint": "^8.58.1"
       },
       "engines": {
@@ -1650,6 +1651,13 @@
       "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
       "dev": true
     },
+    "node_modules/@types/extend": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/extend/-/extend-3.0.4.tgz",
+      "integrity": "sha512-ArMouDUTJEz1SQRpFsT2rIw7DeqICFv5aaVzLSIYMYQSLcwcGOfT3VyglQs/p7K3F7fT4zxr0NWxYZIdifD6dA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/graceful-fs": {
       "version": "4.1.9",
       "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
@@ -8098,9 +8106,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.9.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
-      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz",
+      "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -9645,6 +9653,12 @@
       "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==",
       "dev": true
     },
+    "@types/extend": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/extend/-/extend-3.0.4.tgz",
+      "integrity": "sha512-ArMouDUTJEz1SQRpFsT2rIw7DeqICFv5aaVzLSIYMYQSLcwcGOfT3VyglQs/p7K3F7fT4zxr0NWxYZIdifD6dA==",
+      "dev": true
+    },
     "@types/graceful-fs": {
       "version": "4.1.9",
       "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
@@ -13997,9 +14011,9 @@
       }
     },
     "typescript": {
-      "version": "5.9.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
-      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz",
+      "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==",
       "dev": true
     },
     "typescript-eslint": {
diff --git a/package.json b/package.json
index 6c4a88b..7d361ab 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,7 @@
     "@eslint/js": "^9.39.3",
     "@ibm-cloud/sdk-test-utilities": "^1.0.0",
     "@masterodin/publisher": "^0.10.0",
+    "@types/extend": "^3.0.4",
     "dotenv": "^17.0.0",
     "eslint": "^9.39.3",
     "eslint-config-prettier": "^10.1.8",
@@ -53,7 +54,7 @@
     "installed-check": "^10.0.0",
     "jest": "^29.7.0",
     "nock": "^14.0.1",
-    "typescript": "^5.9.3",
+    "typescript": "^6.0.3",
     "typescript-eslint": "^8.58.1"
   },
   "overrides": {
diff --git a/tsconfig.json b/tsconfig.json
index efb49c8..391958e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,14 +1,12 @@
 {
   "compilerOptions": {
     /* Basic Options */
-    "target": "es5", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', or 'ESNEXT'. */
-    "module": "commonjs", /* Specify module code generation: 'none', commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
+    "target": "ES2022", /* Specify ECMAScript target version */
+    "module": "node16", /* Specify module code generation */
     "resolveJsonModule": true,
     "lib": [
-      "es5",
-      "es2015",
-      "dom",
-      "scripthost"
+      "es2022",
+      "dom"
     ],
     /* Build source files into a folder called `dist` to maintain clean directories, free of ts-generated files */
     "outDir": "./dist",
@@ -18,7 +16,7 @@
     /* Strict Type-Checking Options */
     "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
     /* Module Resolution Options */
-    "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+    "moduleResolution": "node16", /* Specify module resolution strategy */
     "types": [
       "node"
     ] /* Type declaration files to be included in compilation. */