diff --git a/.eslintignore b/.eslintignore
index 125357c5f..c3c66832b 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -16,4 +16,5 @@ tsconfig.tsbuildinfo
 ./deploy*
 *.tar.gz
 *.xml
-public/*
\ No newline at end of file
+public/*
+Makefile
\ No newline at end of file
diff --git a/Makefile b/Makefile
index f87f8c3ee..1ee08aaae 100755
--- a/Makefile
+++ b/Makefile
@@ -21,11 +21,10 @@ init:
 dep:
 	npm install # for commitizen
 
-# shortcut for serve.local
 dev: before_action
-	@$(JSON_CLI) -s '.[0] * .[1]' config/config.json config/config.local.json > /tmp/config.json
+	@$(JSON_CLI) -s '.[0] * .[1]' config/config.json config/config.dev.json > /tmp/config.json
 	@cp /tmp/config.json ./config/config.json
-	npm run local
+	npm run dev
 
 build:
 	npm build
@@ -46,8 +45,6 @@ serve.help:
 serve:
 	$(call serve.help)
 	@echo "\n"
-serve.local:
-	npm run local
 serve.dev:
 	npm run serve.dev
 serve.prod:
diff --git a/config/config.dev.json b/config/config.dev.json
index 63314e75b..856b65a10 100755
--- a/config/config.dev.json
+++ b/config/config.dev.json
@@ -1,4 +1,5 @@
 {
   "//--- endpoint configs ---//": "",
-  "GRAPHQL_ENDPOINT": "https://devapi.coderplanets.com/graphiql"
+  "GRAPHQL_ENDPOINT": "http://localhost:4001/graphiql",
+  "// GRAPHQL_ENDPOINT": "https://api.coderplanets.com/graphiql"
 }
diff --git a/config/config.json b/config/config.json
index 2c3d9086f..29099afdd 100755
--- a/config/config.json
+++ b/config/config.json
@@ -59,7 +59,7 @@
   "//--- contact configs ---//": "",
   "EMAIL_SUPPORT": "coderplanets@outlook.com",
   "// GRAPHQL_ENDPOINT": "https://api.coderplanets.com/graphiql",
-  "BUILD_VERSION": "v2.1.5",
+  "BUILD_VERSION": "v2.1.6",
   "// 1000 * 60 * 10 = 10 mins": "",
   "SSR_CACHE_TIME": 60000
 }
diff --git a/config/config.local.json b/config/config.local.json
deleted file mode 100755
index 856b65a10..000000000
--- a/config/config.local.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "//--- endpoint configs ---//": "",
-  "GRAPHQL_ENDPOINT": "http://localhost:4001/graphiql",
-  "// GRAPHQL_ENDPOINT": "https://api.coderplanets.com/graphiql"
-}
diff --git a/deploy/production/web.tar.gz b/deploy/production/web.tar.gz
index aabeb783e..938a38919 100755
Binary files a/deploy/production/web.tar.gz and b/deploy/production/web.tar.gz differ
diff --git a/package.json b/package.json
index 0a1387c82..f95d8c9e7 100644
--- a/package.json
+++ b/package.json
@@ -3,14 +3,9 @@
   "version": "0.8.1",
   "license": "Apache License 2.0",
   "scripts": {
-    "dev": "cross-env NODE_ENV=dev node server.js",
-    "prod": "cross-env NODE_ENV=production run-p server",
-    "local": "cross-env NODE_ENV=local node server",
-    "nextdev": "cross-env NODE_ENV=dev next dev",
-    "nextstart": "next-boost",
-    "nextstart2": "cross-env NODE_ENV=production next start -p 3000",
+    "dev": "cross-env NODE_ENV=dev next dev",
+    "dev.boost": "next-boost",
     "ci": "cross-env NODE_ENV=ci node server",
-    "server": "npm run clean && node server.js",
     "build": "next build",
     "build:clean": "run-s dist clean",
     "build.prod": "cross-env NODE_ENV=production next build",
@@ -18,8 +13,8 @@
     "build.ci": "cross-env NODE_ENV=ci next build",
     "size.check": "bundlewatch --config size-limit.config.json",
     "serve": "cross-env NODE_ENV=production next start -p ${SERVE_PORT}",
-    "serve.dev": "cross-env NODE_ENV=dev SERVE_PORT=${SERVE_PORT} node server",
-    "serve.prod.old": "cross-env NODE_ENV=production SERVE_PORT=${SERVE_PORT} node server",
+    "serve.dev": "cross-env NODE_ENV=dev next start -p ${SERVE_PORT}",
+    "serve.prod.server": "cross-env NODE_ENV=production SERVE_PORT=${SERVE_PORT} node server",
     "serve.prod.boost": "cross-env NODE_ENV=production next-boost -p ${SERVE_PORT}",
     "serve.prod": "cross-env NODE_ENV=production next start -p ${SERVE_PORT}",
     "dist": "next build && next export -o \"build\"",