diff --git a/package-lock.json b/package-lock.json
index 59c87929..98a33e68 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1980,9 +1980,9 @@
       "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
     },
     "grainstore": {
-      "version": "1.11.0",
-      "resolved": "https://registry.npmjs.org/grainstore/-/grainstore-1.11.0.tgz",
-      "integrity": "sha512-JuEnCHX+qseEgD+Ii5V8SI7VlbSMSE/Jzq0UWC+sdZFi8mFcz15Nj8EKRkF28Rxj2NoWg2tFYMiUb9h8LQEOdg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/grainstore/-/grainstore-2.0.0.tgz",
+      "integrity": "sha512-eDCr8kkpvKaenLqomRnYPQT8ARJZh+QzqtCJ+iHCLyj2pAfGSEnnld6XtCnQdbtCgJsFPrUaaWn12DqCmJiDnQ==",
       "requires": {
         "carto": "0.16.3",
         "debug": "~3.1.0",
@@ -2010,9 +2010,9 @@
           },
           "dependencies": {
             "semver": {
-              "version": "5.6.0",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-              "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
+              "version": "5.7.0",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+              "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
             }
           }
         },
@@ -2030,9 +2030,9 @@
           },
           "dependencies": {
             "semver": {
-              "version": "5.6.0",
-              "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
-              "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
+              "version": "5.7.0",
+              "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+              "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
             }
           }
         },
@@ -3938,9 +3938,9 @@
       }
     },
     "torque.js": {
-      "version": "2.17.1",
-      "resolved": "https://registry.npmjs.org/torque.js/-/torque.js-2.17.1.tgz",
-      "integrity": "sha512-jZuw5P3muNoILsmiN2kaclzczYW6h9HBSQo5riEB1ub/oNzmj7FqvFJOJKG3dbsxuAqOMn0+AwcQUC3Fb0YTRw==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/torque.js/-/torque.js-3.0.0.tgz",
+      "integrity": "sha512-xwxRaf3ftq25BoMySqFMB3aHlhC3o0Xj02peILusijFWJzg+ewd7m+9XxAUBbROC11ZUjW7K5d2bZ48j4RmiTQ==",
       "requires": {
         "carto": "github:cartodb/carto#85881d99dd7fcf2c4e16478b04db67108d27a50c",
         "d3": "3.5.17",
@@ -4139,9 +4139,9 @@
       "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": "5.0.0",
+      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-5.0.0.tgz",
+      "integrity": "sha512-OMjOhiJa7tA8Pty41bTAXf9d6uIlMU3aCyzS2/cZ620MfRF6RhORnOMiTa/iV856KAiqWFjl7U1MJnIs2xe0MQ==",
       "requires": {
         "@carto/mapnik": "3.6.2-carto.11",
         "@carto/tilelive-bridge": "github:cartodb/tilelive-bridge#8ce03ffd995cf0986b9d6ee7ffbbf310908625c9",
@@ -4151,7 +4151,7 @@
         "cartodb-psql": "0.13.1",
         "debug": "3.1.0",
         "dot": "1.1.2",
-        "grainstore": "^1.11.0",
+        "grainstore": "^2.0.0",
         "queue-async": "1.1.0",
         "redis-mpool": "0.7.0",
         "request": "2.87.0",
@@ -4159,7 +4159,7 @@
         "sphericalmercator": "1.0.5",
         "tilelive": "5.12.3",
         "tilelive-mapnik": "github:cartodb/tilelive-mapnik#3f2021f6c5fd720bf09114ed4e012579564723c0",
-        "torque.js": "2.17.1",
+        "torque.js": "^3.0.0",
         "underscore": "1.6.0"
       }
     },
diff --git a/package.json b/package.json
index c394c05e..8304b552 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": "^5.0.0",
     "yargs": "11.1.0"
   },
   "devDependencies": {