diff --git a/app.js b/app.js
index 4bd8a6b4..f432a617 100755
--- a/app.js
+++ b/app.js
@@ -33,5 +33,7 @@ var Windshaft = require('windshaft');
 var serverOptions = require('./lib/cartodb/server_options');
 
 ws = CartodbWindshaft(serverOptions);
-ws.listen(global.environment.port);
-console.log("Windshaft tileserver started on port " + global.environment.port);
+ws.listen(global.environment.port, global.environment.host);
+ws.on('listening', function() {
+  console.log("Windshaft tileserver started on " + global.environment.host + ':' + global.environment.port);
+});
diff --git a/cluster.js b/cluster.js
index d72600d1..fc342a34 100755
--- a/cluster.js
+++ b/cluster.js
@@ -41,12 +41,15 @@ var ws = CartodbWindshaft(serverOptions);
 //.use(cluster.pidfiles('pids'))
 var cluster = new Cluster({
   port: global.environment.port,
+  host: global.environment.host,
   monPort: global.environment.port+1,
-  noWorkers: 1 // .set('workers', 1)
+  monHost: global.environment.host,
+  noWorkers: 1 
 });
 
 cluster.listen(function(cb) {
   cb(ws);
+}, function() {
+  console.log("Windshaft tileserver started on port " + global.environment.port);
 });
 
-console.log("Windshaft tileserver started on port " + global.environment.port);
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index dd2a909b..5862215f 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -4,7 +4,7 @@
   "dependencies": {
     "cluster2": {
       "version": "0.3.5-cdb01",
-      "from": "git://github.com/CartoDB/cluster2.git#28cde11",
+      "from": "git://github.com/CartoDB/cluster2.git#cdb_production",
       "dependencies": {
         "express": {
           "version": "2.5.11",
diff --git a/package.json b/package.json
index 2f37affd..ebceadeb 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
       "email": "simon@vizzuality.com"
     },
     "dependencies": {
-        "cluster2": "git://github.com/CartoDB/cluster2.git#28cde11",
+        "cluster2": "git://github.com/CartoDB/cluster2.git#cdb_production",
         "node-varnish": "0.1.1",
         "underscore"  : "~1.3.3",
         "grainstore"  : "~0.9.1",