diff --git a/.env b/.env
index 9dd61ea6..7716aac9 100644
--- a/.env
+++ b/.env
@@ -1,4 +1,4 @@
 # NODE_ENV = 'production'
 NODE_ENV = 'development'
-VUE_APP_BASE_URL = 'http://18.167.251.121:10086'
-# VUE_APP_BASE_URL = 'https://api.aida.com.hk'
+# VUE_APP_BASE_URL = 'http://18.167.251.121:10086'
+VUE_APP_BASE_URL = 'https://api.aida.com.hk'
diff --git a/.env.dev b/.env.dev
new file mode 100644
index 00000000..7f61b9b6
--- /dev/null
+++ b/.env.dev
@@ -0,0 +1,9 @@
+NODE_ENV = 'development'
+# VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
+# VUE_APP_BASE_URL = 'https://api.aida.com.hk'
+
+# VUE_APP_BASE_URL = 'http://18.167.251.121:10086'
+VUE_APP_BASE_URL = 'https://test.api.aida.com.hk'
+
+# VUE_APP_BASE_URL = 'http://192.168.1.9:5567'
+# VUE_APP_BASE_URL = 'http://192.168.1.6:7766'
diff --git a/.env.dev_build b/.env.dev_build
new file mode 100644
index 00000000..3d9aa1b1
--- /dev/null
+++ b/.env.dev_build
@@ -0,0 +1,7 @@
+NODE_ENV = 'production'
+# VUE_APP_BASE_URL = 'https://aida.com.hk/test'
+# VUE_APP_BASE_URL = 'http://18.167.251.121:10088'
+# VUE_APP_BASE_URL = 'https://api.aida.com.hk'
+VUE_APP_BASE_URL = 'https://test.api.aida.com.hk'
+# VUE_APP_BASE_URL = 'https://api.aida.com.hk'
+
diff --git a/.env.production b/.env.production
index 2210f4c3..4741690b 100644
--- a/.env.production
+++ b/.env.production
@@ -1,4 +1,4 @@
 NODE_ENV = 'production'
-VUE_APP_BASE_URL = 'http://18.167.251.121:10086'
+# VUE_APP_BASE_URL = 'http://18.167.251.121:10086'
 # VUE_APP_BASE_URL = 'https://polyu.api.aida.com.hk'
-# VUE_APP_BASE_URL = 'https://api.aida.com.hk'
+VUE_APP_BASE_URL = 'https://api.aida.com.hk'
diff --git a/.env.test b/.env.test
index d980f1f9..d6e2db64 100644
--- a/.env.test
+++ b/.env.test
@@ -1,7 +1,7 @@
 NODE_ENV = 'development'
-# VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
+VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
 # VUE_APP_BASE_URL = 'https://api.aida.com.hk'
 
-VUE_APP_BASE_URL = 'http://18.167.251.121:10086'
+# VUE_APP_BASE_URL = 'http://18.167.251.121:10086'
 # VUE_APP_BASE_URL = 'http://192.168.1.9:5567'
 # VUE_APP_BASE_URL = 'http://192.168.1.6:7766'
diff --git a/package.json b/package.json
index 58f8e4ba..d90da5c5 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,8 @@
     "build": "vue-cli-service build",
     "serve:test": "vue-cli-service serve --mode test",
     "build:test": "vue-cli-service build --mode test_build",
+	"serve:dev": "vue-cli-service serve --mode dev",
+    "build:dev": "vue-cli-service build --mode dev_build",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {