diff --git a/package.json b/package.json
index b507825..5113f89 100644
--- a/package.json
+++ b/package.json
@@ -56,13 +56,14 @@
     "test": "jest --verbose --detectOpenHandles",
     "test-watch": "jest --verbose --watchAll",
     "dev": "./node_modules/.bin/tsc --watch",
-    "serve": "env NODE_ENV=development ./node_modules/.bin/nodemon dist/app.js",
+    "serve": "./node_modules/.bin/cross-env NODE_ENV=development ./node_modules/.bin/nodemon dist/app.js",
     "build": "./node_modules/.bin/tsc",
     "assets": "./node_modules/.bin/gulp build",
-    "start": "env NODE_ENV=production node ./dist/app.js"
+    "start": "./node_modules/.bin/cross-env node ./dist/app.js"
   },
   "main": "dist/index.js",
   "devDependencies": {
+    "cross-env": "^7.0.2",
     "gulp": "^4.0.2",
     "gulp-clean-css": "^4.3.0",
     "gulp-minify": "^3.1.0",
diff --git a/yarn.lock b/yarn.lock
index a2418b9..d0aaf23 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1877,6 +1877,13 @@ cors@^2.8.5:
     object-assign "^4"
     vary "^1"
 
+cross-env@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.2.tgz#bd5ed31339a93a3418ac4f3ca9ca3403082ae5f9"
+  integrity sha512-KZP/bMEOJEDCkDQAyRhu3RL2ZO/SUVrxQVI0G3YEQ+OLbRA3c6zgixe8Mq8a/z7+HKlNEjo8oiLUs8iRijY2Rw==
+  dependencies:
+    cross-spawn "^7.0.1"
+
 cross-spawn@^6.0.0:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -1888,7 +1895,7 @@ cross-spawn@^6.0.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.0:
+cross-spawn@^7.0.0, cross-spawn@^7.0.1:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==