diff --git a/package-lock.json b/package-lock.json
index 87e82282..497597d1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3934,8 +3934,8 @@
       }
     },
     "tilelive-mapnik": {
-      "version": "github:cartodb/tilelive-mapnik#abb4529faf23a404e769a88e1f21d18132863578",
-      "from": "github:cartodb/tilelive-mapnik#refactor",
+      "version": "github:cartodb/tilelive-mapnik#a89d4147b3288804b679a018271893dda18373c2",
+      "from": "github:cartodb/tilelive-mapnik#0.6.18-cdb18",
       "requires": {
         "@carto/mapnik": "3.6.2-carto.11",
         "generic-pool": "3.5.0",
@@ -4156,8 +4156,9 @@
       "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU="
     },
     "windshaft": {
-      "version": "github:cartodb/windshaft#b1a2c4b325b0b402020f509dc7f2fa9ede259349",
-      "from": "github:cartodb/windshaft#refactor",
+      "version": "4.13.1",
+      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-4.13.1.tgz",
+      "integrity": "sha512-sjk8D6gOZTp2jb7iuF38FyhPIcAAOUsOQtS+SmTLLIk1AipEK+xQU11IVl9cOvhiaCYjs7dRLscM54qoMqKVxw==",
       "requires": {
         "@carto/mapnik": "3.6.2-carto.11",
         "@carto/tilelive-bridge": "github:cartodb/tilelive-bridge#e35ae36a6e2d555a6b312440f7e1904c5ad03664",
@@ -4174,7 +4175,7 @@
         "semver": "5.5.0",
         "sphericalmercator": "1.0.5",
         "tilelive": "5.12.3",
-        "tilelive-mapnik": "github:cartodb/tilelive-mapnik#abb4529faf23a404e769a88e1f21d18132863578",
+        "tilelive-mapnik": "github:cartodb/tilelive-mapnik#a89d4147b3288804b679a018271893dda18373c2",
         "torque.js": "2.17.1",
         "underscore": "1.6.0"
       }
diff --git a/package.json b/package.json
index 40512671..e0ca099c 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#refactor",
+    "windshaft": "^4.13.1",
     "yargs": "11.1.0"
   },
   "devDependencies": {