diff --git a/package-lock.json b/package-lock.json
index d3616e4a..49bf142b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,22 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@carto/cartonik": {
+      "version": "github:cartodb/cartonik#62889c2a46b2b22170c1feff51661bd4fced95c1",
+      "from": "github:cartodb/cartonik#unify-tilelive",
+      "requires": {
+        "@carto/mapnik": "^3.6.2-carto.11",
+        "generic-pool": "^3.6.1",
+        "mime": "^2.4.0"
+      },
+      "dependencies": {
+        "mime": {
+          "version": "2.4.0",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
+          "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w=="
+        }
+      }
+    },
     "@carto/fqdn-sync": {
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/@carto/fqdn-sync/-/fqdn-sync-0.2.2.tgz",
@@ -26,14 +42,6 @@
         }
       }
     },
-    "@carto/tilelive-bridge": {
-      "version": "github:cartodb/tilelive-bridge#8ce03ffd995cf0986b9d6ee7ffbbf310908625c9",
-      "from": "github:cartodb/tilelive-bridge#2.5.1-cdb12",
-      "requires": {
-        "@carto/mapnik": "3.6.2-carto.11",
-        "generic-pool": "^3.6.1"
-      }
-    },
     "abaculus": {
       "version": "github:cartodb/abaculus#3283c523d8bd4bdec78d90166d9c23ff09865ca8",
       "from": "github:cartodb/abaculus#2.0.3-cdb13",
@@ -2931,11 +2939,6 @@
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
-    "object-keys": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
-      "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY="
-    },
     "on-finished": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
@@ -3276,16 +3279,6 @@
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
       "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
     },
-    "progress-stream": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/progress-stream/-/progress-stream-0.5.0.tgz",
-      "integrity": "sha1-zEdZFnpv9PBYdheThPC2rg0ddYc=",
-      "requires": {
-        "single-line-log": "~0.3.1",
-        "speedometer": "~0.1.2",
-        "through2": "~0.2.3"
-      }
-    },
     "propagate": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/propagate/-/propagate-1.0.0.tgz",
@@ -3601,11 +3594,6 @@
       "resolved": "https://registry.npmjs.org/simple-statistics/-/simple-statistics-0.9.2.tgz",
       "integrity": "sha1-PjXLEDCPx2ljqk7nJS5qbqENKOQ="
     },
-    "single-line-log": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/single-line-log/-/single-line-log-0.3.1.tgz",
-      "integrity": "sha1-p61lB/IYzl3+FsS/LWWSRkGeegY="
-    },
     "sntp": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
@@ -3647,11 +3635,6 @@
       "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
       "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="
     },
-    "speedometer": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/speedometer/-/speedometer-0.1.4.tgz",
-      "integrity": "sha1-mHbb0qFp0xFUAtSObqYynIgWpQ0="
-    },
     "sphericalmercator": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/sphericalmercator/-/sphericalmercator-1.0.5.tgz",
@@ -3868,75 +3851,6 @@
       "resolved": "http://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
     },
-    "through2": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-0.2.3.tgz",
-      "integrity": "sha1-6zKE2k6jEbbMis42U3SKUqvyWj8=",
-      "requires": {
-        "readable-stream": "~1.1.9",
-        "xtend": "~2.1.1"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "1.1.14",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "xtend": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-          "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
-          "requires": {
-            "object-keys": "~0.4.0"
-          }
-        }
-      }
-    },
-    "tilelive": {
-      "version": "5.12.3",
-      "resolved": "https://registry.npmjs.org/tilelive/-/tilelive-5.12.3.tgz",
-      "integrity": "sha1-nIx3DhGUqo01PZodAxR0BDB83r0=",
-      "requires": {
-        "minimist": "~0.2.0",
-        "progress-stream": "~0.5.x",
-        "queue-async": "~1.0.7",
-        "sphericalmercator": "~1.0.1"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz",
-          "integrity": "sha1-Tf/lJdriuGTGbC4jxicdev3s784="
-        },
-        "queue-async": {
-          "version": "1.0.7",
-          "resolved": "https://registry.npmjs.org/queue-async/-/queue-async-1.0.7.tgz",
-          "integrity": "sha1-Iq4KHaxKkvW81GNPmTxoKiqBCUU="
-        }
-      }
-    },
-    "tilelive-mapnik": {
-      "version": "github:cartodb/tilelive-mapnik#3f2021f6c5fd720bf09114ed4e012579564723c0",
-      "from": "github:cartodb/tilelive-mapnik#0.6.18-cdb20",
-      "requires": {
-        "@carto/mapnik": "3.6.2-carto.11",
-        "generic-pool": "^3.6.1",
-        "mime": "2.3.1"
-      },
-      "dependencies": {
-        "mime": {
-          "version": "2.3.1",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.3.1.tgz",
-          "integrity": "sha512-OEUllcVoydBHGN1z84yfQDimn58pZNNNXgZlHXSboxMlFvgI6MXSWpWKpFRra7H1HxpVhHTkrghfRW49k6yjeg=="
-        }
-      }
-    },
     "torque.js": {
       "version": "2.17.1",
       "resolved": "https://registry.npmjs.org/torque.js/-/torque.js-2.17.1.tgz",
@@ -4139,12 +4053,11 @@
       "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU="
     },
     "windshaft": {
-      "version": "4.13.5",
-      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-4.13.5.tgz",
-      "integrity": "sha512-e4ZG+ofpuk74hASiqRTD6OqsNpziiXWzr8V5ZAGzcR3ErmlvaM4rEqLplI7AZ9Y3Hx5KUW0H7veCfxf1vhHQEg==",
+      "version": "github:cartodb/windshaft#8b226a0391831245c1af74bf6c22f3cb064ca4c1",
+      "from": "github:cartodb/windshaft#cartonik",
       "requires": {
+        "@carto/cartonik": "github:cartodb/cartonik#62889c2a46b2b22170c1feff51661bd4fced95c1",
         "@carto/mapnik": "3.6.2-carto.11",
-        "@carto/tilelive-bridge": "github:cartodb/tilelive-bridge#8ce03ffd995cf0986b9d6ee7ffbbf310908625c9",
         "abaculus": "github:cartodb/abaculus#3283c523d8bd4bdec78d90166d9c23ff09865ca8",
         "canvas": "github:cartodb/node-canvas#45bd3c7cc5e6f99ba75b0d417b6ac6384b43083d",
         "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c",
@@ -4157,8 +4070,6 @@
         "request": "2.87.0",
         "semver": "5.5.0",
         "sphericalmercator": "1.0.5",
-        "tilelive": "5.12.3",
-        "tilelive-mapnik": "github:cartodb/tilelive-mapnik#3f2021f6c5fd720bf09114ed4e012579564723c0",
         "torque.js": "2.17.1",
         "underscore": "1.6.0"
       }
diff --git a/package.json b/package.json
index b6a87350..9850a598 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": "4.13.5",
+    "windshaft": "github:cartodb/windshaft#cartonik",
     "yargs": "11.1.0"
   },
   "devDependencies": {