diff --git a/src/discovery/discovery-service.ts b/src/discovery/discovery-service.ts
index ee704621..6eaea11f 100644
--- a/src/discovery/discovery-service.ts
+++ b/src/discovery/discovery-service.ts
@@ -150,4 +150,8 @@ export default class DiscoveryService extends AuthenticatedService<DiscoveryServ
         }
         return endpoint;
     }
+
+    [Symbol.dispose]() {
+        return this.destroy();
+    }
 }
diff --git a/src/driver.ts b/src/driver.ts
index b6d55ff0..f53c2d94 100644
--- a/src/driver.ts
+++ b/src/driver.ts
@@ -112,8 +112,7 @@ export default class Driver {
         this.logger.debug('Driver has been destroyed.');
     }
 
-    // TODO: Upgrade project to TS 5.2+
-    // async [Symbol.asyncDispose]() {
-    //     return this.destroy();
-    // }
+    async [Symbol.asyncDispose]() {
+        return this.destroy();
+    }
 }
diff --git a/src/schema/scheme-client.ts b/src/schema/scheme-client.ts
index 47ea25f1..e5cb43c7 100644
--- a/src/schema/scheme-client.ts
+++ b/src/schema/scheme-client.ts
@@ -72,4 +72,8 @@ export default class SchemeClient extends EventEmitter {
     public async destroy() {
         return;
     }
+
+    [Symbol.dispose]() {
+        return this.destroy();
+    }
 }
diff --git a/src/table/table-client.ts b/src/table/table-client.ts
index a7a55323..e6efabe1 100644
--- a/src/table/table-client.ts
+++ b/src/table/table-client.ts
@@ -51,4 +51,8 @@ export class TableClient extends EventEmitter {
     public async destroy(ctx: Context): Promise<void> {
         await this.pool.destroy(ctx);
     }
+
+    async [Symbol.asyncDispose]() {
+        return this.destroy();
+    }
 }
diff --git a/tsconfig-cjs.json b/tsconfig-cjs.json
index 57618278..7b5c494c 100644
--- a/tsconfig-cjs.json
+++ b/tsconfig-cjs.json
@@ -1,6 +1,7 @@
 {
   "extends": "./tsconfig-base.json",
   "compilerOptions": {
+    "lib": ["ES2022","ESNext.Disposable"],
     "target": "es2017",
     "module": "commonjs",
     "outDir": "build/cjs"
diff --git a/tsconfig-esm.json b/tsconfig-esm.json
index 2cedbf4e..778fff02 100644
--- a/tsconfig-esm.json
+++ b/tsconfig-esm.json
@@ -1,6 +1,7 @@
 {
   "extends": "./tsconfig-base.json",
   "compilerOptions": {
+    "lib": ["ES2022","ESNext.Disposable"],
     "module": "commonjs",
     "outDir": "build/esm",
     "target": "esnext"
diff --git a/tsconfig.json b/tsconfig.json
index 57618278..7b5c494c 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,6 +1,7 @@
 {
   "extends": "./tsconfig-base.json",
   "compilerOptions": {
+    "lib": ["ES2022","ESNext.Disposable"],
     "target": "es2017",
     "module": "commonjs",
     "outDir": "build/cjs"