diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 72c3298f..ef7bfe98 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,6 +15,8 @@ jobs:
         include:
           - container: 'node:16.0.0'
             node_api_target: '20.0.0'
+          - container: 'node:16.0.0'
+            node_api_target: '21.2.0'
     container: ${{ matrix.container }}
     steps:
       - name: Checkout
@@ -35,11 +37,17 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-2019, macos-11]
-        node_api_target: ['14.0.0', '15.0.0', '16.0.0', '17.0.1', '18.0.0', '20.0.0']
+        node_api_target: ['14.0.0', '15.0.0', '16.0.0', '17.0.1', '18.0.0', '20.0.0', '21.2.0']
+        include:
+          - os: macos-11
+            python_version: '3.11'
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python_version }}
       - uses: actions/setup-node@v3
         with:
           node-version: '16'
@@ -59,6 +67,9 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
       - uses: actions/setup-node@v3
         with:
           node-version: '16'
@@ -89,10 +100,19 @@ jobs:
       fail-fast: false
       matrix:
         os: ['ubuntu-latest', 'windows-2019', 'macos-latest']
-        nodejs: ['14', '16', '17', '18', '20']
+        nodejs: ['14', '16', '17', '18', '20', '21']
+        include:
+          - os: 'macos-latest'
+            python_version: '3.11'
+          - os: 'macos-latest'
+            nodejs: '14'
+            python_version: '3.10'
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python_version }}
       - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.nodejs }}
diff --git a/package-lock.json b/package-lock.json
index 02738f56..31c20840 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -59,8 +59,8 @@
         "@opentelemetry/sdk-trace-node": "1.17.1",
         "@opentelemetry/semantic-conventions": "1.17.1",
         "is-promise": "^4.0.0",
-        "nan": "^2.17.0",
-        "node-gyp-build": "^4.6.0",
+        "nan": "^2.18.0",
+        "node-gyp-build": "^4.6.1",
         "protobufjs": "^7.2.4",
         "semver": "^7.5.4"
       },
@@ -7001,9 +7001,9 @@
       }
     },
     "node_modules/nan": {
-      "version": "2.17.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
-      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ=="
+      "version": "2.18.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz",
+      "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w=="
     },
     "node_modules/nanoid": {
       "version": "3.3.3",
@@ -7076,9 +7076,9 @@
       }
     },
     "node_modules/node-abi": {
-      "version": "3.45.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.45.0.tgz",
-      "integrity": "sha512-iwXuFrMAcFVi/ZoZiqq8BzAdsLw9kxDfTC0HMyjXfSL/6CSDAGD5UmR7azrAgWV1zKYq7dUUMj4owusBWKLsiQ==",
+      "version": "3.51.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.51.0.tgz",
+      "integrity": "sha512-SQkEP4hmNWjlniS5zdnfIXTk1x7Ome85RDzHlTbBtzE97Gfwz/Ipw4v/Ryk20DWIy3yCNVLVlGKApCnmvYoJbA==",
       "dev": true,
       "dependencies": {
         "semver": "^7.3.5"
@@ -7108,9 +7108,9 @@
       }
     },
     "node_modules/node-gyp-build": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz",
-      "integrity": "sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==",
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.1.tgz",
+      "integrity": "sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ==",
       "bin": {
         "node-gyp-build": "bin.js",
         "node-gyp-build-optional": "optional.js",
@@ -15526,9 +15526,9 @@
       }
     },
     "nan": {
-      "version": "2.17.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
-      "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ=="
+      "version": "2.18.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz",
+      "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w=="
     },
     "nanoid": {
       "version": "3.3.3",
@@ -15591,9 +15591,9 @@
       }
     },
     "node-abi": {
-      "version": "3.45.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.45.0.tgz",
-      "integrity": "sha512-iwXuFrMAcFVi/ZoZiqq8BzAdsLw9kxDfTC0HMyjXfSL/6CSDAGD5UmR7azrAgWV1zKYq7dUUMj4owusBWKLsiQ==",
+      "version": "3.51.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.51.0.tgz",
+      "integrity": "sha512-SQkEP4hmNWjlniS5zdnfIXTk1x7Ome85RDzHlTbBtzE97Gfwz/Ipw4v/Ryk20DWIy3yCNVLVlGKApCnmvYoJbA==",
       "dev": true,
       "requires": {
         "semver": "^7.3.5"
@@ -15609,9 +15609,9 @@
       }
     },
     "node-gyp-build": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz",
-      "integrity": "sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ=="
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.1.tgz",
+      "integrity": "sha512-24vnklJmyRS8ViBNI8KbtK/r/DmXQMRiOMXTNz2nrTnAYUwjmEEbnnpB/+kt+yWRv73bPsSPRFddrcIbAxSiMQ=="
     },
     "node-preload": {
       "version": "0.2.1",
diff --git a/package.json b/package.json
index a6d7bcdf..f171ed00 100644
--- a/package.json
+++ b/package.json
@@ -80,10 +80,10 @@
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.2.1",
     "gts": "^5.0.0",
-		"kafkajs": "^2.2.4",
+    "kafkajs": "^2.2.4",
     "mocha": "^10.2.0",
     "mysql2": "^2.2.5",
-		"nock": "^13.3.1",
+    "nock": "^13.3.1",
     "nyc": "15.1.0",
     "octokit": "^2.0.14",
     "pg": "^8.4.2",
@@ -150,8 +150,8 @@
     "@opentelemetry/sdk-trace-node": "1.17.1",
     "@opentelemetry/semantic-conventions": "1.17.1",
     "is-promise": "^4.0.0",
-    "nan": "^2.17.0",
-    "node-gyp-build": "^4.6.0",
+    "nan": "^2.18.0",
+    "node-gyp-build": "^4.6.1",
     "protobufjs": "^7.2.4",
     "semver": "^7.5.4"
   },
diff --git a/scripts/prebuild-os.js b/scripts/prebuild-os.js
index 253d9d63..bef76f80 100644
--- a/scripts/prebuild-os.js
+++ b/scripts/prebuild-os.js
@@ -3,7 +3,16 @@ const prebuildify = require('prebuildify');
 let targets = process.argv.slice(2);
 
 if (targets.length == 0) {
-  targets = ['14.0.0', '15.0.0', '16.0.0', '17.0.1', '18.0.0', '19.0.0', '20.0.0'];
+  targets = [
+    '14.0.0',
+    '15.0.0',
+    '16.0.0',
+    '17.0.1',
+    '18.0.0',
+    '19.0.0',
+    '20.0.0',
+    '21.2.0'
+  ];
 }
 
 prebuildify({