diff --git a/package-lock.json b/package-lock.json
index 47478ee9..cb0a4134 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,8 +5,8 @@
   "requires": true,
   "dependencies": {
     "@carto/cartonik": {
-      "version": "github:cartodb/cartonik#89dea6126674fef4e2d6800dc8b86e4cd353ae76",
-      "from": "github:cartodb/cartonik#unify-tilelive",
+      "version": "github:cartodb/cartonik#c66c4e673a397df5d047752e759b896e861c22d1",
+      "from": "github:cartodb/cartonik#master",
       "requires": {
         "@carto/mapnik": "^3.6.2-carto.11",
         "generic-pool": "^3.6.1",
@@ -14,9 +14,9 @@
       },
       "dependencies": {
         "mime": {
-          "version": "2.4.0",
-          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
-          "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w=="
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.2.tgz",
+          "integrity": "sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg=="
         }
       }
     },
@@ -30,7 +30,7 @@
       "resolved": "https://registry.npmjs.org/@carto/mapnik/-/mapnik-3.6.2-carto.13.tgz",
       "integrity": "sha512-F1hxZEBpTLvf04ddzf1t1sjNtHBajFPHL6exfzj47lipTDYj1HB1/50ojlg6a+aBE1n5CcCqocHuB7r1cZMxDA==",
       "requires": {
-        "mapnik-vector-tile": "github:cartodb/mapnik-vector-tile#v1.6.1-carto.2",
+        "mapnik-vector-tile": "github:cartodb/mapnik-vector-tile#e7ca5471f9e5de81243e6035e70444321fc0a82f",
         "nan": "2.13.2",
         "node-pre-gyp": "0.12.0"
       },
@@ -42,14 +42,6 @@
         }
       }
     },
-    "@carto/tilelive-bridge": {
-      "version": "github:cartodb/tilelive-bridge#3c0c4930bf56f4df1b65f0bc98293057506ebe5d",
-      "from": "github:cartodb/tilelive-bridge#2.5.1-cdb13",
-      "requires": {
-        "@carto/mapnik": "3.6.2-carto.13",
-        "generic-pool": "^3.6.1"
-      }
-    },
     "abaculus": {
       "version": "github:cartodb/abaculus#7288aa301e843197225e94b0b123ed5d1b804601",
       "from": "github:cartodb/abaculus#2.0.3-cdb14",
@@ -426,7 +418,7 @@
       "integrity": "sha512-1z3Dk9G8KQlNGurbcmGBvNj8DVCh1Keue9uzyyvB6hKOYzBHMxixAMG0D+8nSsA7oQmWUsx/xkZZ5ZxT9toEHA==",
       "requires": {
         "debug": "^3.1.0",
-        "pg": "github:cartodb/node-postgres#6.4.2-cdb2",
+        "pg": "github:cartodb/node-postgres#5417d7b29b7272ca2e71bb396899ab3f177a9ae6",
         "underscore": "~1.6.0"
       }
     },
@@ -2050,7 +2042,7 @@
         "carto": "0.16.3",
         "debug": "~3.1.0",
         "generic-pool": "~2.2.0",
-        "millstone": "github:cartodb/millstone#v0.6.17-carto.2",
+        "millstone": "github:cartodb/millstone#f201885250d2d7ea6c870a1e1060ca6bcfdef186",
         "postcss": "~5.2.8",
         "postcss-scss": "0.4.0",
         "postcss-strip-inline-comments": "0.1.5",
@@ -3911,81 +3903,12 @@
       "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#731322968cb08223a450cd717973dc2d09905e94",
-      "from": "github:cartodb/tilelive-mapnik#0.6.18-cdb21",
-      "requires": {
-        "@carto/mapnik": "3.6.2-carto.13",
-        "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": "3.1.0",
       "resolved": "https://registry.npmjs.org/torque.js/-/torque.js-3.1.0.tgz",
       "integrity": "sha512-xX0BVo/gAy5A2Qx17dbgzjB2cnzuSDwzohdT1hGaKbG0jveL3sKgKE5VyzlN1/l4hP3p6f/m20HvZo3waIawCQ==",
       "requires": {
-        "carto": "github:cartodb/carto#master",
+        "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c",
         "d3": "3.5.17",
         "turbo-carto": "^0.21.1",
         "turf-jenks": "~1.0.1"
@@ -4182,15 +4105,14 @@
       "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU="
     },
     "windshaft": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-5.1.1.tgz",
-      "integrity": "sha512-fKGfCGi9V5uGRJKRWtBA8b2uOqQMPgq3JOGVdzRT+M+zpauRjH7XEbTO+W7TQ3vOBdl2VAgK41qX11fN4s7pow==",
+      "version": "github:cartodb/windshaft#b854c8467034e5ba5c4b894df22d400ec939a710",
+      "from": "github:cartodb/windshaft#cartonik",
       "requires": {
+        "@carto/cartonik": "github:cartodb/cartonik#c66c4e673a397df5d047752e759b896e861c22d1",
         "@carto/mapnik": "3.6.2-carto.13",
-        "@carto/tilelive-bridge": "github:cartodb/tilelive-bridge#2.5.1-cdb13",
-        "abaculus": "github:cartodb/abaculus#2.0.3-cdb14",
+        "abaculus": "github:cartodb/abaculus#7288aa301e843197225e94b0b123ed5d1b804601",
         "canvas": "^2.4.1",
-        "carto": "github:cartodb/carto#0.15.1-cdb5",
+        "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c",
         "cartodb-psql": "0.13.1",
         "debug": "3.1.0",
         "grainstore": "^2.0.0",
@@ -4199,8 +4121,6 @@
         "request": "2.87.0",
         "semver": "5.5.0",
         "sphericalmercator": "1.0.5",
-        "tilelive": "5.12.3",
-        "tilelive-mapnik": "github:cartodb/tilelive-mapnik#0.6.18-cdb21",
         "torque.js": "^3.1.0",
         "underscore": "1.6.0"
       }
diff --git a/package.json b/package.json
index de2b539c..85a302d0 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": "5.1.1",
+    "windshaft": "github:cartodb/windshaft#cartonik",
     "yargs": "11.1.0"
   },
   "devDependencies": {