diff --git a/config/environments/development.js b/config/environments/development.js
index e141bfda..9ed0731f 100644
--- a/config/environments/development.js
+++ b/config/environments/development.js
@@ -18,6 +18,9 @@ var config = {
         */
         simplify: true
     }
+    ,millstone: {
+        cache_basedir: '/tmp/cdb-tiler-dev/millstone-dev'
+    }
     ,redis: {
         host: '127.0.0.1',
         port: 6379,
diff --git a/config/environments/production.js b/config/environments/production.js
index 28365971..15a3c9bc 100644
--- a/config/environments/production.js
+++ b/config/environments/production.js
@@ -12,6 +12,9 @@ var config = {
         extent: "-20005048.4188,-20005048.4188,20005048.4188,20005048.4188",
         simplify: true
     }
+    ,millstone: {
+        cache_basedir: '/home/ubuntu/tile_assets/'
+    }
     ,redis: {
         host: '127.0.0.1',
         port: 6379
diff --git a/config/environments/staging.js b/config/environments/staging.js
index 87c0e1c6..c96bb78a 100644
--- a/config/environments/staging.js
+++ b/config/environments/staging.js
@@ -12,6 +12,9 @@ var config = {
         extent: "-20005048.4188,-20005048.4188,20005048.4188,20005048.4188",
         simplify: true
     }
+    ,millstone: {
+        cache_basedir: '/home/ubuntu/tile_assets/'
+    }
     ,redis: {
         host: '127.0.0.1',
         port: 6379
diff --git a/config/environments/test.js b/config/environments/test.js
index d7ee5739..3b8f27f3 100644
--- a/config/environments/test.js
+++ b/config/environments/test.js
@@ -13,6 +13,9 @@ var config = {
         extent: "-20005048.4188,-20005048.4188,20005048.4188,20005048.4188",
         simplify: true
     }
+    ,millstone: {
+        cache_basedir: '/tmp/cdb-tiler-test/millstone'
+    }
     ,redis: {
         host: '127.0.0.1',
         port: 6333,
diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js
index 81433005..9a56d360 100644
--- a/lib/cartodb/server_options.js
+++ b/lib/cartodb/server_options.js
@@ -5,7 +5,10 @@ var   _          = require('underscore')
 module.exports = function(){
     var me = {
         base_url: '/tiles/:table',
-        grainstore: {datasource: global.environment.postgres},
+        grainstore: {
+          datasource: global.environment.postgres,
+          cachedir: global.environment.millstone.cache_basedir
+        },
         redis: global.environment.redis,
         enable_cors: global.environment.enable_cors,
         varnish_host: global.environment.varnish.host,
diff --git a/package.json b/package.json
index 97b35645..0cd4f08e 100644
--- a/package.json
+++ b/package.json
@@ -22,8 +22,8 @@
         "cluster": "0.6.4",
         "node-varnish": "0.1.1",
         "underscore"  : "1.1.x",
-        "grainstore"  : "~0.5.0",
-        "windshaft"  : "~0.4.13",
+        "grainstore"  : "~0.6.2",
+        "windshaft"  : "~0.4.14",
         "step": "0.0.x",
         "generic-pool": "1.0.x",
         "redis": "0.6.7",