diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index bd07eb7..bc94525 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -20,6 +20,10 @@ jobs:
             node_arch: x64
             command: build:gyp
             args: --arch x64+arm64
+          - os: windows-2019
+            label: x86
+            node_arch: x86
+            command: build:gyp
           - os: windows-2019
             label: x64
             node_arch: x64
diff --git a/package-lock.json b/package-lock.json
index 4070bf7..a4dd156 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,12 +11,12 @@
       "license": "MIT",
       "dependencies": {
         "nan": "^2.19.0",
-        "node-gyp-build": "^4.8.0"
+        "node-gyp-build": "github:derevnjuk/node-gyp-build#0d253a1f7f903f8ac211c5dfc711ffc422d6e3f4"
       },
       "devDependencies": {
         "@semantic-release/exec": "^6.0.3",
         "@semantic-release/git": "^10.0.1",
-        "prebuildify": "^6.0.0",
+        "prebuildify": "github:derevnjuk/prebuildify#fde6268682ac5093257ec28b5dbc0eaa3807dc4e",
         "prebuildify-cross": "^5.1.0",
         "semantic-release": "^23.0.8"
       }
@@ -2771,15 +2771,6 @@
         "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/execspawn": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/execspawn/-/execspawn-1.0.1.tgz",
-      "integrity": "sha512-s2k06Jy9i8CUkYe0+DxRlvtkZoOkwwfhB+Xxo5HGUtrISVW2m98jO2tr67DGRFxZwkjQqloA3v/tNtjhBRBieg==",
-      "dev": true,
-      "dependencies": {
-        "util-extend": "^1.0.1"
-      }
-    },
     "node_modules/fast-glob": {
       "version": "3.3.2",
       "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
@@ -4277,9 +4268,9 @@
       "dev": true
     },
     "node_modules/node-abi": {
-      "version": "3.47.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.47.0.tgz",
-      "integrity": "sha512-2s6B2CWZM//kPgwnuI0KrYwNjfdByE25zvAaEpq9IH4zcNsarH8Ihu/UuX6XMPEogDAxkuUFeZn60pXNHAqn3A==",
+      "version": "3.58.0",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.58.0.tgz",
+      "integrity": "sha512-pXY1jnGf5T7b8UNzWzIqf0EkX4bx/w8N2AvwlGnk2SYYA/kzDVPaH0Dh0UG4EwxBB5eKOIZKPr8VAHSHL1DPGg==",
       "dev": true,
       "dependencies": {
         "semver": "^7.3.5"
@@ -4305,8 +4296,8 @@
     },
     "node_modules/node-gyp-build": {
       "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.0.tgz",
-      "integrity": "sha512-u6fs2AEUljNho3EYTJNBfImO5QTo/J/1Etd+NVdCj7qWKUSN/bSLkZwhDv7I+w/MSC6qJ4cknepkAYykDdK8og==",
+      "resolved": "git+ssh://git@github.com/derevnjuk/node-gyp-build.git#0d253a1f7f903f8ac211c5dfc711ffc422d6e3f4",
+      "integrity": "sha512-k5kOAtbp3q+puv3wHV6ZMMAHa2oKH9TTOHWCv8GcJDp4a3EaFvXpFtp2eQiSiP2fPloZD9uaH9f3rrPzfEIMLw==",
       "bin": {
         "node-gyp-build": "bin.js",
         "node-gyp-build-optional": "optional.js",
@@ -7620,14 +7611,13 @@
     },
     "node_modules/prebuildify": {
       "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/prebuildify/-/prebuildify-6.0.0.tgz",
-      "integrity": "sha512-DEvK4C3tcimIp7Pzqbs036n9i6CTKGp1XVEpMnr4wV3enKU5sBogPP+lP3KZw7993i42bXnsd5eIxAXQ566Cqw==",
+      "resolved": "git+ssh://git@github.com/derevnjuk/prebuildify.git#fde6268682ac5093257ec28b5dbc0eaa3807dc4e",
+      "integrity": "sha512-etbb1J+9URW2Z8gNnPIftmGs3sDu/Oysp4fyyb5k81zlvqdflO7qRdU9LW04ahmS2wh53P5uma1up1v3vAzrcw==",
       "dev": true,
       "dependencies": {
-        "execspawn": "^1.0.1",
         "minimist": "^1.2.5",
         "mkdirp-classic": "^0.5.3",
-        "node-abi": "^3.3.0",
+        "node-abi": "^3.58.0",
         "npm-run-path": "^3.1.0",
         "pump": "^3.0.0",
         "tar-fs": "^2.1.0"
@@ -9254,12 +9244,6 @@
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "dev": true
     },
-    "node_modules/util-extend": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz",
-      "integrity": "sha512-mLs5zAK+ctllYBj+iAQvlDCwoxU/WDOUaJkcFudeiAX6OajC6BKXJUa9a+tbtkC11dz2Ufb7h0lyvIOVn4LADA==",
-      "dev": true
-    },
     "node_modules/validate-npm-package-license": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
diff --git a/package.json b/package.json
index 90989b2..74766e1 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "nan": "^2.19.0",
-    "node-gyp-build": "^4.8.0"
+    "node-gyp-build": "github:derevnjuk/node-gyp-build#0d253a1f7f903f8ac211c5dfc711ffc422d6e3f4"
   },
   "contributors": [
     {
@@ -32,8 +32,8 @@
   ],
   "scripts": {
     "semantic-release": "semantic-release",
-    "build:gyp": "prebuildify --strip --target 10.24.1 --target 12.22.12 --target 14.21.3 --target 16.20.2 --target 18.17.1 --target 19.9.0 --target 20.12.2 --target 21.7.3",
-    "build:gyp-cross": "prebuildify-cross --strip --target 10.24.1 --target 12.22.12 --target 14.21.3 --target 16.20.2 --target 18.17.1 --target 19.9.0 --target 20.12.2 --target 21.7.3",
+    "build:gyp": "prebuildify --napi false --strip --target 10.24.1 --target 12.22.12 --target 14.21.3 --target 16.20.2 --target 18.17.1 --target 19.9.0 --target 20.12.2 --target 21.7.3",
+    "build:gyp-cross": "prebuildify-cross --napi false --strip --target 10.24.1 --target 12.22.12 --target 14.21.3 --target 16.20.2 --target 18.17.1 --target 19.9.0 --target 20.12.2 --target 21.7.3",
     "install": "node-gyp-build"
   },
   "repository": {
@@ -63,7 +63,7 @@
   "devDependencies": {
     "@semantic-release/exec": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
-    "prebuildify": "^6.0.0",
+    "prebuildify": "github:derevnjuk/prebuildify#fde6268682ac5093257ec28b5dbc0eaa3807dc4e",
     "prebuildify-cross": "^5.1.0",
     "semantic-release": "^23.0.8"
   }