diff --git a/node_modules/c9/hostname.js b/node_modules/c9/hostname.js
index 5371df02..033acacc 100644
--- a/node_modules/c9/hostname.js
+++ b/node_modules/c9/hostname.js
@@ -6,7 +6,7 @@ exports.parse = function(hostname) {
         type: parts[0],
         provider: parts[1],
         region: parts[2],
-        index: parts[3],
+        index: parts[5] || parts[3],
         env: parts[4]
     };
 };
diff --git a/server.js b/server.js
index f04bc837..8c24b8e6 100755
--- a/server.js
+++ b/server.js
@@ -12,6 +12,7 @@ var optimist = require("optimist");
 var async = require("async");
 var os = require("os");
 var urls = require("c9/urls");
+var hostname = require("c9/hostname");
 var child_process = require("child_process");
 require("c9/setup_paths.js");
 
@@ -56,9 +57,7 @@ if (!module.parent)
     main(process.argv.slice(2));
 
 function getDefaultSettings() {
-    var hostname = os.hostname();
-    
-    var suffix = hostname.trim().split("-").pop() || "";
+    var suffix = hostname.parse(os.hostname()).env;
     var modes = {
         "workflowstaging": "workflow-staging",
         "prod": "deploy",