diff --git a/src/server/build.js b/src/server/build.js
index 5a87f37a7b37..e26ac0a93582 100644
--- a/src/server/build.js
+++ b/src/server/build.js
@@ -29,9 +29,9 @@ program
 // The key is the field created in `program` variable for
 // each command line argument. Value is the env variable.
 getEnvConfig(program, {
-  staticDir: 'STORYBOOK_STATIC_DIR',
-  outputDir: 'STORYBOOK_OUTPUT_DIR',
-  configDir: 'STORYBOOK_CONFIG_DIR',
+  staticDir: 'STATIC_DIR',
+  outputDir: 'OUTPUT_DIR',
+  configDir: 'CONFIG_DIR',
 });
 
 const configDir = program.configDir || './.storybook';
diff --git a/src/server/index.js b/src/server/index.js
index 947d1b0e0bb8..42e9c5282c23 100755
--- a/src/server/index.js
+++ b/src/server/index.js
@@ -27,11 +27,11 @@ program
 // The key is the field created in `program` variable for
 // each command line argument. Value is the env variable.
 getEnvConfig(program, {
-  port: 'STORYBOOK_PORT',
-  host: 'STORYBOOK_HOST',
-  staticDir: 'STORYBOOK_STATIC_DIR',
-  configDir: 'STORYBOOK_CONFIG_DIR',
-  dontTrack: 'STORYBOOK_DO_NOT_TRACK',
+  port: 'PORT',
+  host: 'HOSTNAME',
+  staticDir: 'STATIC_DIR',
+  configDir: 'CONFIG_DIR',
+  dontTrack: 'DO_NOT_TRACK',
 });
 
 if (program.dontTrack) {