diff --git a/package.json b/package.json
index adaa4cc1..8ad0eda7 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "step-profiler": "~0.3.0",
     "turbo-carto": "0.19.0",
     "underscore": "~1.6.0",
-    "windshaft": "cartodb/windshaft#0675de5edcb2a24179dcd6224c3f309b68f17bbd",
+    "windshaft": "cartodb/windshaft#515efb2d9237a1511b81a61fd6f7524184df38ea",
     "windshaft-stats": "cartodb/windshaft-stats#5f41e0a69763692f45f76cbae7f1e784186e1e7d",
     "yargs": "~5.0.0"
   },
diff --git a/yarn.lock b/yarn.lock
index 0f4c6c2a..05642fd5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -254,7 +254,7 @@ cartodb-psql@0.7.1, cartodb-psql@~0.7.1:
     step "~0.0.6"
     underscore "~1.6.0"
 
-cartodb-psql@~0.8.0:
+cartodb-psql@0.8.0, cartodb-psql@~0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/cartodb-psql/-/cartodb-psql-0.8.0.tgz#d3811f706dae2c3bc82365c5d25af13c4235ba37"
   dependencies:
@@ -2117,17 +2117,17 @@ through@2:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
-tilelive-bridge@cartodb/tilelive-bridge#buffer-size:
+tilelive-bridge@cartodb/tilelive-bridge#2.3.1-cdb1:
   version "2.3.1-cdb1"
-  resolved "https://codeload.github.com/cartodb/tilelive-bridge/tar.gz/9df4bde07f3cf9ffbda42657066559e2b8875e1b"
+  resolved "https://codeload.github.com/cartodb/tilelive-bridge/tar.gz/3f76c278c782e93d79045870387a0a06bace720b"
   dependencies:
     mapnik "~3.5.0"
     mapnik-pool "~0.1.3"
     sphericalmercator "1.0.x"
 
-tilelive-mapnik@cartodb/tilelive-mapnik#fix-buffer-size-0:
+tilelive-mapnik@cartodb/tilelive-mapnik#0.6.18-cdb1:
   version "0.6.18-cdb1"
-  resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/c67400573572e836609dd75a7acec8f414a50dbe"
+  resolved "https://codeload.github.com/cartodb/tilelive-mapnik/tar.gz/cf7e5b4633db653a889a6c6e6a5ddcbcf4ddc3b5"
   dependencies:
     generic-pool "~2.4.0"
     mapnik "3.5.14"
@@ -2297,14 +2297,14 @@ windshaft-stats@cartodb/windshaft-stats#5f41e0a69763692f45f76cbae7f1e784186e1e7d
     debug "~2.6.6"
     step "~1.0.0"
 
-windshaft@cartodb/windshaft#0675de5edcb2a24179dcd6224c3f309b68f17bbd:
-  version "3.1.1"
-  resolved "https://codeload.github.com/cartodb/windshaft/tar.gz/0675de5edcb2a24179dcd6224c3f309b68f17bbd"
+windshaft@cartodb/windshaft#515efb2d9237a1511b81a61fd6f7524184df38ea:
+  version "3.1.3"
+  resolved "https://codeload.github.com/cartodb/windshaft/tar.gz/515efb2d9237a1511b81a61fd6f7524184df38ea"
   dependencies:
     abaculus cartodb/abaculus#2.0.3-cdb1
     canvas cartodb/node-canvas#1.6.2-cdb2
     carto cartodb/carto#0.15.1-cdb3
-    cartodb-psql "0.7.1"
+    cartodb-psql "0.8.0"
     debug "~2.2.0"
     dot "~1.0.2"
     grainstore "~1.6.0"
@@ -2316,8 +2316,8 @@ windshaft@cartodb/windshaft#0675de5edcb2a24179dcd6224c3f309b68f17bbd:
     sphericalmercator "1.0.4"
     step "~0.0.6"
     tilelive "5.12.2"
-    tilelive-bridge cartodb/tilelive-bridge#buffer-size
-    tilelive-mapnik cartodb/tilelive-mapnik#fix-buffer-size-0
+    tilelive-bridge cartodb/tilelive-bridge#2.3.1-cdb1
+    tilelive-mapnik cartodb/tilelive-mapnik#0.6.18-cdb1
     torque.js "~2.11.0"
     underscore "~1.6.0"