diff --git a/app.js b/app.js
index eb65ad90..58316bc6 100755
--- a/app.js
+++ b/app.js
@@ -64,7 +64,7 @@ const availableEnvironments = {
 };
 
 if (!availableEnvironments[process.env.NODE_ENV]) {
-    logger.fatal(new Error(`Invalid environment argument, valid ones: ${Object.keys(availableEnvironments).join(', ')}`));
+    logger.fatal(new Error(`Invalid environment ${process.env.NODE_ENV} argument, valid ones: ${Object.keys(availableEnvironments).join(', ')}`));
     process.exit(1);
 }
 
diff --git a/config/environments/config.js b/config/environments/config.js
index 52d3aa14..21aa0952 100644
--- a/config/environments/config.js
+++ b/config/environments/config.js
@@ -1,5 +1,5 @@
 var config = {
-    environment: process.env.NODE_ENV,
+    environment: process.env.CARTO_WINDSHAFT_NODE_ENV,
     port: 8181,
     host: null, // null on purpouse so it listens to whatever address docker assigns
     // Size of the threadpool which can be used to run user code and get notified in the loop thread