diff --git a/NEWS.md b/NEWS.md
index 4dd3f191..7ac8d370 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -13,12 +13,13 @@ Announcements:
 - Fix boolean aggregation layer option not working when numbers of rows are above the threshold (#1082)
 - Update deps:
   - camshat@0.64.0
-  - windshaft@5.1.0:
+  - windshaft@5.1.1:
     - Upgrade `tilelive-mapnik` to version `0.6.18-cdb20`
     - Upgrade `@carto/tilelive-bridge` to version `2.5.1-cdb12`
     - Upgrade `grainstore` to version `2.0.0`
     - Upgrade `torque.js` to version `3.1.0`
     - Upgrade `canvas` to version `2.4.1`
+    - Update @carto/mapnik to [`3.6.2-carto.13`](https://github.com/CartoDB/node-mapnik/blob/v3.6.2-carto.13/CHANGELOG.carto.md#362-carto13).
 
 
 ## 7.0.0
diff --git a/package-lock.json b/package-lock.json
index 6e012cea..f50f7c54 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,35 +10,35 @@
       "integrity": "sha512-hvD8HlzgWkFsCswIHs+wtrIK8HEGC2L8jny3JY00lQ/xwurLxWR+xMYpgjI821INmjEPRFtajFQkniB1HxNBkQ=="
     },
     "@carto/mapnik": {
-      "version": "3.6.2-carto.11",
-      "resolved": "https://registry.npmjs.org/@carto/mapnik/-/mapnik-3.6.2-carto.11.tgz",
-      "integrity": "sha1-8vC8TQBRCAFpJnxccpuQxryTRmE=",
+      "version": "3.6.2-carto.13",
+      "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#e7ca5471f9e5de81243e6035e70444321fc0a82f",
-        "nan": "2.10.0",
-        "node-pre-gyp": "0.10.0"
+        "mapnik-vector-tile": "github:cartodb/mapnik-vector-tile#v1.6.1-carto.2",
+        "nan": "2.13.2",
+        "node-pre-gyp": "0.12.0"
       },
       "dependencies": {
         "nan": {
-          "version": "2.10.0",
-          "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
-          "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA=="
+          "version": "2.13.2",
+          "resolved": "https://registry.npmjs.org/nan/-/nan-2.13.2.tgz",
+          "integrity": "sha512-TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw=="
         }
       }
     },
     "@carto/tilelive-bridge": {
-      "version": "github:cartodb/tilelive-bridge#8ce03ffd995cf0986b9d6ee7ffbbf310908625c9",
-      "from": "github:cartodb/tilelive-bridge#2.5.1-cdb12",
+      "version": "github:Algunenano/tilelive-bridge#f53c2a681c462fa34ef842a151bceec2746fef9f",
+      "from": "github:Algunenano/tilelive-bridge#mapnik13",
       "requires": {
-        "@carto/mapnik": "3.6.2-carto.11",
+        "@carto/mapnik": "3.6.2-carto.13",
         "generic-pool": "^3.6.1"
       }
     },
     "abaculus": {
-      "version": "github:cartodb/abaculus#3283c523d8bd4bdec78d90166d9c23ff09865ca8",
-      "from": "github:cartodb/abaculus#2.0.3-cdb13",
+      "version": "github:Algunenano/abaculus#d390c502130709f547c1c424f22f4c582bf898ec",
+      "from": "github:Algunenano/abaculus#mapnik13",
       "requires": {
-        "@carto/mapnik": "3.6.2-carto.11",
+        "@carto/mapnik": "3.6.2-carto.13",
         "d3-queue": "^2.0.2",
         "sphericalmercator": "1.0.5"
       }
@@ -410,7 +410,7 @@
       "integrity": "sha512-1z3Dk9G8KQlNGurbcmGBvNj8DVCh1Keue9uzyyvB6hKOYzBHMxixAMG0D+8nSsA7oQmWUsx/xkZZ5ZxT9toEHA==",
       "requires": {
         "debug": "^3.1.0",
-        "pg": "github:cartodb/node-postgres#5417d7b29b7272ca2e71bb396899ab3f177a9ae6",
+        "pg": "github:cartodb/node-postgres#6.4.2-cdb2",
         "underscore": "~1.6.0"
       }
     },
@@ -2034,7 +2034,7 @@
         "carto": "0.16.3",
         "debug": "~3.1.0",
         "generic-pool": "~2.2.0",
-        "millstone": "github:cartodb/millstone#f201885250d2d7ea6c870a1e1060ca6bcfdef186",
+        "millstone": "github:cartodb/millstone#v0.6.17-carto.2",
         "postcss": "~5.2.8",
         "postcss-scss": "0.4.0",
         "postcss-strip-inline-comments": "0.1.5",
@@ -2814,22 +2814,27 @@
       "optional": true
     },
     "needle": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-2.2.4.tgz",
-      "integrity": "sha512-HyoqEb4wr/rsoaIDfTH2aVL9nWtQqba2/HvMv+++m8u0dz808MaagKILxtfeSN7QU7nvbQ79zk3vYOJp9zsNEA==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-2.3.0.tgz",
+      "integrity": "sha512-QBZu7aAFR0522EyaXZM0FZ9GLpq6lvQ3uq8gteiDUp7wKdy0lSd2hPlgFwVuW1CBkfEs9PfDQsQzZghLs/psdg==",
       "requires": {
-        "debug": "^2.1.2",
+        "debug": "^4.1.0",
         "iconv-lite": "^0.4.4",
         "sax": "^1.2.4"
       },
       "dependencies": {
         "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+          "version": "4.1.1",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
           "requires": {
-            "ms": "2.0.0"
+            "ms": "^2.1.1"
           }
+        },
+        "ms": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+          "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
         }
       }
     },
@@ -2856,17 +2861,17 @@
       }
     },
     "node-pre-gyp": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz",
-      "integrity": "sha512-G7kEonQLRbcA/mOoFoxvlMrw6Q6dPf92+t/l0DFSMuSlDoWaI9JWIyPwK0jyE1bph//CUEL65/Fz1m2vJbmjQQ==",
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.12.0.tgz",
+      "integrity": "sha512-4KghwV8vH5k+g2ylT+sLTjy5wmUOb9vPhnM8NHvRf9dHmnW/CndrFXy2aRPaPST6dugXSdHXfeaHQm77PIz/1A==",
       "requires": {
         "detect-libc": "^1.0.2",
         "mkdirp": "^0.5.1",
-        "needle": "^2.2.0",
+        "needle": "^2.2.1",
         "nopt": "^4.0.1",
         "npm-packlist": "^1.1.6",
         "npmlog": "^4.0.2",
-        "rc": "^1.1.7",
+        "rc": "^1.2.7",
         "rimraf": "^2.6.1",
         "semver": "^5.3.0",
         "tar": "^4"
@@ -3690,9 +3695,9 @@
       }
     },
     "spdx-license-ids": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz",
-      "integrity": "sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g=="
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.4.tgz",
+      "integrity": "sha512-7j8LYJLeY/Yb6ACbQ7F76qy5jHkp0U6jgBfJsk97bwWlVUnUWsAgpyaCvo17h0/RQGnQ036tVDomiwoI4pDkQA=="
     },
     "speedometer": {
       "version": "0.1.4",
@@ -3969,10 +3974,10 @@
       }
     },
     "tilelive-mapnik": {
-      "version": "github:cartodb/tilelive-mapnik#3f2021f6c5fd720bf09114ed4e012579564723c0",
-      "from": "github:cartodb/tilelive-mapnik#0.6.18-cdb20",
+      "version": "github:Algunenano/tilelive-mapnik#b25d2e3a43f70aa9dff378f363c55950761c18d3",
+      "from": "github:Algunenano/tilelive-mapnik#mapnik13",
       "requires": {
-        "@carto/mapnik": "3.6.2-carto.11",
+        "@carto/mapnik": "3.6.2-carto.13",
         "generic-pool": "^3.6.1",
         "mime": "2.3.1"
       },
@@ -3989,7 +3994,7 @@
       "resolved": "https://registry.npmjs.org/torque.js/-/torque.js-3.1.0.tgz",
       "integrity": "sha512-xX0BVo/gAy5A2Qx17dbgzjB2cnzuSDwzohdT1hGaKbG0jveL3sKgKE5VyzlN1/l4hP3p6f/m20HvZo3waIawCQ==",
       "requires": {
-        "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c",
+        "carto": "github:cartodb/carto#master",
         "d3": "3.5.17",
         "turbo-carto": "^0.21.1",
         "turf-jenks": "~1.0.1"
@@ -4186,18 +4191,16 @@
       "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU="
     },
     "windshaft": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-5.1.0.tgz",
-      "integrity": "sha512-MCLZLsktgQi3nSR+hreyTAnYbkhZ4y7HHQToJXXCswrziF2qBV4CCdOXSU+pfIfGv8We52BipvG8odC5erWvGw==",
+      "version": "5.1.1",
+      "resolved": "github:algunenano/windshaft#ae05af04504bfa2f9f829ebc35e9cfc00579b310",
       "requires": {
-        "@carto/mapnik": "3.6.2-carto.11",
-        "@carto/tilelive-bridge": "github:cartodb/tilelive-bridge#8ce03ffd995cf0986b9d6ee7ffbbf310908625c9",
-        "abaculus": "github:cartodb/abaculus#3283c523d8bd4bdec78d90166d9c23ff09865ca8",
+        "@carto/mapnik": "3.6.2-carto.13",
+        "@carto/tilelive-bridge": "github:Algunenano/tilelive-bridge#mapnik13",
+        "abaculus": "github:Algunenano/abaculus#mapnik13",
         "canvas": "^2.4.1",
-        "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c",
+        "carto": "github:cartodb/carto#0.15.1-cdb5",
         "cartodb-psql": "0.13.1",
         "debug": "3.1.0",
-        "dot": "1.1.2",
         "grainstore": "^2.0.0",
         "queue-async": "1.1.0",
         "redis-mpool": "0.7.0",
@@ -4205,7 +4208,7 @@
         "semver": "5.5.0",
         "sphericalmercator": "1.0.5",
         "tilelive": "5.12.3",
-        "tilelive-mapnik": "github:cartodb/tilelive-mapnik#3f2021f6c5fd720bf09114ed4e012579564723c0",
+        "tilelive-mapnik": "github:Algunenano/tilelive-mapnik#mapnik13",
         "torque.js": "^3.1.0",
         "underscore": "1.6.0"
       }
diff --git a/package.json b/package.json
index 20b660ca..de2b539c 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.0",
+    "windshaft": "5.1.1",
     "yargs": "11.1.0"
   },
   "devDependencies": {