diff --git a/NEWS.md b/NEWS.md
index 9f0ff97c..188102fc 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -10,6 +10,7 @@ Announcements:
     - Update @carto/mapnik to [`3.6.2-carto.15`](https://github.com/CartoDB/node-mapnik/blob/v3.6.2-carto.15/CHANGELOG.carto.md#362-carto15).
     - Update turbo-carto to [`0.21.2`](https://github.com/CartoDB/turbo-carto/releases/tag/0.21.2)
     - Upgrade `@carto/cartonik` to version [0.6.0](https://github.com/CartoDB/cartonik/blob/v0.6.0/CHANGELOG.md#v060-2019-06-17).
+    - Upgrade `windshaft` to version [5.4.0](https://github.com/CartoDB/Windshaft/releases/tag/5.4.0)
 
 ## 7.1.0
 Released 2019-05-06
diff --git a/package-lock.json b/package-lock.json
index da880561..1339f77c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,7 +32,7 @@
       "resolved": "https://registry.npmjs.org/@carto/mapnik/-/mapnik-3.6.2-carto.15.tgz",
       "integrity": "sha512-O6YpFQ8NRJJZjiQJxoS92Hpjci1tvd4SWKxaicG3SuRBqVGY3BKdhChL+6Ck6tRZvW3O577987vVwEnYKALTCA==",
       "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.14.0",
         "node-pre-gyp": "0.13.0"
       },
@@ -417,7 +417,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"
       }
     },
@@ -2044,7 +2044,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",
@@ -2941,9 +2941,9 @@
       },
       "dependencies": {
         "resolve": {
-          "version": "1.11.0",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.0.tgz",
-          "integrity": "sha512-WL2pBDjqT6pGUNSUzMw00o4T7If+z4H2x3Gz893WoUQ5KW8Vr9txp00ykiP16VBaZF5+j/OcXJHZ9+PCvdiDKw==",
+          "version": "1.11.1",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.11.1.tgz",
+          "integrity": "sha512-vIpgF6wfuJOZI7KKKSP+HmiKggadPQAdsp5HiC1mvqnfp0gF1vdwgBWZIdrVft9pgqoMFQN+R7BSWZiBxx+BBw==",
           "requires": {
             "path-parse": "^1.0.6"
           }
@@ -3334,9 +3334,9 @@
       "dev": true
     },
     "process-nextick-args": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
-      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
     },
     "propagate": {
       "version": "1.0.0",
@@ -3921,11 +3921,11 @@
       "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
     },
     "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==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/torque.js/-/torque.js-3.1.1.tgz",
+      "integrity": "sha512-kfIrmI7TGqJT/J9DH8Mgvd9VEwcvAtnvyYyqymSN6WZ5L4BaVQEQ+zu5FgLChNAqCaRkqGc7bKp0Hj9A0rempA==",
       "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"
@@ -3940,19 +3940,6 @@
             "underscore": "1.8.3"
           }
         },
-        "turbo-carto": {
-          "version": "0.21.2",
-          "resolved": "https://registry.npmjs.org/turbo-carto/-/turbo-carto-0.21.2.tgz",
-          "integrity": "sha512-yUqc5V9U5UEVksMfNSlDOr03mHEQBa187iTM4nbTiOwViBVAo/ndW07INt2np9gin+YO8MFJjo7Ioo8lr+3xUQ==",
-          "requires": {
-            "cartocolor": "4.0.0",
-            "colorbrewer": "1.0.0",
-            "debug": "^3.1.0",
-            "es6-promise": "3.1.2",
-            "postcss": "5.0.19",
-            "postcss-value-parser": "3.3.0"
-          }
-        },
         "underscore": {
           "version": "1.8.3",
           "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
@@ -4122,14 +4109,14 @@
       "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU="
     },
     "windshaft": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-5.3.0.tgz",
-      "integrity": "sha512-tirrSpUXJ3vJ3Es95yDq0DzEkb2M0ueNIPIONqCwjyCEikjvFRbu9N+j1pcJAhFiitbdG36rUZftO++vPCMiiQ==",
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-5.4.0.tgz",
+      "integrity": "sha512-gqEZyNqD99ErfpORWuxz7AmNnN0hDBimJD4ZCJUq4tSjIbLQT02P6WLw+uyijktqP3ZuZK+33CES+9JL3MMasQ==",
       "requires": {
         "@carto/cartonik": "^0.6.0",
         "@carto/mapnik": "3.6.2-carto.15",
         "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",
@@ -4137,7 +4124,7 @@
         "redis-mpool": "0.7.0",
         "request": "2.87.0",
         "semver": "5.5.0",
-        "torque.js": "^3.1.0",
+        "torque.js": "3.1.1",
         "underscore": "1.6.0"
       }
     },
diff --git a/package.json b/package.json
index e71a3438..374b1923 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "step-profiler": "0.3.0",
     "turbo-carto": "0.21.2",
     "underscore": "1.6.0",
-    "windshaft": "^5.3.0",
+    "windshaft": "5.4.0",
     "yargs": "11.1.0"
   },
   "devDependencies": {