diff --git a/package-lock.json b/package-lock.json
index a2483242..e7ed324b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -270,9 +270,9 @@
       "integrity": "sha1-Iqk2kB4wKa/NdUfrRIfOtpejvwg="
     },
     "builtin-modules": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.0.0.tgz",
-      "integrity": "sha512-hMIeU4K2ilbXV6Uv93ZZ0Avg/M91RaKXucQ+4me2Do1txxBDyDZWCBa5bJSLqoNTRpXTLwEzIk1KmloenDDjhg=="
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+      "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8="
     },
     "bunyan": {
       "version": "1.8.1",
@@ -2290,11 +2290,11 @@
       "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0="
     },
     "is-builtin-module": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-3.0.0.tgz",
-      "integrity": "sha512-/93sDihsAD652hrMEbJGbMAVBf1qc96kyThHQ0CAOONHaE3aROLpTjDe4WQ5aoC5ITHFxEq1z8XqSU7km+8amw==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz",
+      "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=",
       "requires": {
-        "builtin-modules": "^3.0.0"
+        "builtin-modules": "^1.0.0"
       }
     },
     "is-fullwidth-code-point": {
@@ -2888,12 +2888,12 @@
       }
     },
     "normalize-package-data": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.1.tgz",
-      "integrity": "sha512-ZVuHxWJv1bopjv/SD5uPhgwUhLqxdJ+SsdUQbGR9HWlXrvnd/C08Cn9Bq48PbvX3y5V97GIpAHpL5Bk9BwChGg==",
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.2.tgz",
+      "integrity": "sha512-YcMnjqeoUckXTPKZSAsPjUPLxH85XotbpqK3w4RyCwdFQSU5FxxBys8buehkSfg0j9fKvV1hn7O0+8reEgkAiw==",
       "requires": {
         "hosted-git-info": "^2.1.4",
-        "is-builtin-module": "^3.0.0",
+        "is-builtin-module": "^1.0.0",
         "semver": "2 || 3 || 4 || 5",
         "validate-npm-package-license": "^3.0.1"
       }
@@ -3932,8 +3932,8 @@
       }
     },
     "tilelive-mapnik": {
-      "version": "github:cartodb/tilelive-mapnik#40a8dd085f1bfd2b9bd6e49a5df5f43c6162e5dd",
-      "from": "github:cartodb/tilelive-mapnik#dynamic-map-pool",
+      "version": "github:cartodb/tilelive-mapnik#716290cf738c2c9f15ec9d5c13dd668959636728",
+      "from": "github:cartodb/tilelive-mapnik#refactor",
       "requires": {
         "@carto/mapnik": "3.6.2-carto.11",
         "generic-pool": "3.5.0",
@@ -4154,8 +4154,8 @@
       "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU="
     },
     "windshaft": {
-      "version": "github:cartodb/windshaft#1103736d0f925f9c08cf7f4c0bebe6b6f68d416a",
-      "from": "github:cartodb/windshaft#dynamic-map-pool",
+      "version": "github:cartodb/windshaft#0e09596c6ab338b7c5a3e781a6dac15a86e397ee",
+      "from": "github:cartodb/windshaft#refactor",
       "requires": {
         "@carto/mapnik": "3.6.2-carto.11",
         "@carto/tilelive-bridge": "github:cartodb/tilelive-bridge#e35ae36a6e2d555a6b312440f7e1904c5ad03664",
@@ -4172,7 +4172,7 @@
         "semver": "5.5.0",
         "sphericalmercator": "1.0.5",
         "tilelive": "5.12.3",
-        "tilelive-mapnik": "github:cartodb/tilelive-mapnik#40a8dd085f1bfd2b9bd6e49a5df5f43c6162e5dd",
+        "tilelive-mapnik": "github:cartodb/tilelive-mapnik#716290cf738c2c9f15ec9d5c13dd668959636728",
         "torque.js": "2.17.1",
         "underscore": "1.6.0"
       }
diff --git a/package.json b/package.json
index 0de95824..40512671 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "step-profiler": "0.3.0",
     "turbo-carto": "0.21.0",
     "underscore": "1.6.0",
-    "windshaft": "github:cartodb/windshaft#dynamic-map-pool",
+    "windshaft": "github:cartodb/windshaft#refactor",
     "yargs": "11.1.0"
   },
   "devDependencies": {