diff --git a/package.json b/package.json
index e6879ba..2ad9dde 100644
--- a/package.json
+++ b/package.json
@@ -27,11 +27,11 @@
   },
   "scripts": {
     "start": "concurrently -n server,client -c blue,green \"npm run start_server\" \"npm run start_client\"",
-    "start_server": "cd server && node ./index.js",
-    "start_client": "webpack-dev-server --env.NODE_ENV=development --hot",
+    "start_server": "cd server && NODE_ENV=development node ./index.js",
+    "start_client": "NODE_ENV=development webpack-dev-server --hot",
     "build": "npm run build_server && npm run build_client",
     "build_server": "cd server && lake build",
-    "build_client": "webpack --env.NODE_ENV=production"
+    "build_client": "NODE_ENV=production webpack"
   },
   "eslintConfig": {
     "extends": [
diff --git a/server/index.js b/server/index.js
index 20ec89b..7f8bb80 100644
--- a/server/index.js
+++ b/server/index.js
@@ -14,10 +14,17 @@ const server = app
 
 const wss = new WebSocket.Server({ server })
 
-let cmd = "./build/bin/gameserver";
-let cmdArgs = ["TestGame","../testgame"];
-// let cmd = "docker";
-// let cmdArgs = ["run", "--runtime=runsc", "--network=none", "--rm", "-i", "nng4:latest"];
+const environment = process.env.NODE_ENV
+const isDevelopment = environment === 'development'
+
+let cmd, cmdArgs;
+if (isDevelopment) {
+    cmd = "./build/bin/gameserver";
+    cmdArgs = ["TestGame","../testgame"];
+} else{
+    cmd = "docker";
+    cmdArgs = ["run", "--runtime=runsc", "--network=none", "--rm", "-i", "testgame:latest"];
+}
 
 class ClientConnection {
 
diff --git a/webpack.config.js b/webpack.config.js
index fb8459a..01d7d85 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -3,7 +3,8 @@ const webpack = require("webpack");
 const ReactRefreshWebpackPlugin = require('@pmmmwh/react-refresh-webpack-plugin');
 
 module.exports = env => {
-  const isDevelopment = env.NODE_ENV !== 'production';
+  const environment = process.env.NODE_ENV
+  const isDevelopment = environment === 'development'
   
   const babelOptions = {
     presets: ['@babel/preset-env', '@babel/preset-react'],