diff --git a/assets-with-roadhog/config/config.default.js b/assets-with-roadhog/config/config.default.js
index 61c02b7..03830a3 100644
--- a/assets-with-roadhog/config/config.default.js
+++ b/assets-with-roadhog/config/config.default.js
@@ -22,13 +22,14 @@ module.exports = appInfo => {
     publicPath: '/public/',
     devServer: {
       debug: false,
+      autoPort: true,
       command: 'roadhog dev',
-      port: 8000,
       env: {
+        PORT: '{port}',
         BROWSER: 'none',
         ESLINT: 'none',
-        SOCKET_SERVER: 'http://127.0.0.1:8000',
-        PUBLIC_PATH: 'http://127.0.0.1:8000',
+        SOCKET_SERVER: 'http://127.0.0.1:{port}',
+        PUBLIC_PATH: 'http://127.0.0.1:{port}',
       },
     },
   };
diff --git a/assets-with-roadhog/test/app/controller/home.test.js b/assets-with-roadhog/test/app/controller/home.test.js
index aa36c58..03a414e 100644
--- a/assets-with-roadhog/test/app/controller/home.test.js
+++ b/assets-with-roadhog/test/app/controller/home.test.js
@@ -16,7 +16,7 @@ describe('test/app/controller/home.test.js', () => {
   it('should GET /', async function() {
     return app.httpRequest()
       .get('/')
-      .expect(/http:\/\/127.0.0.1:8000\/index.js/)
+      .expect(/http:\/\/127.0.0.1:10000\/index.js/)
       .expect(200);
   });
 
diff --git a/assets-with-umi/config/config.default.js b/assets-with-umi/config/config.default.js
index b92fe45..bb7b3b0 100644
--- a/assets-with-umi/config/config.default.js
+++ b/assets-with-umi/config/config.default.js
@@ -19,14 +19,14 @@ module.exports = appInfo => {
     publicPath: '/public/',
     devServer: {
       debug: true,
-      command: 'umi dev',
-      port: 8000,
+      autoPort: true,
+      command: 'umi dev --port={port}',
       env: {
         APP_ROOT: process.cwd() + '/app/web',
         BROWSER: 'none',
         ESLINT: 'none',
-        SOCKET_SERVER: 'http://127.0.0.1:8000',
-        PUBLIC_PATH: 'http://127.0.0.1:8000',
+        SOCKET_SERVER: 'http://127.0.0.1:{port}',
+        PUBLIC_PATH: 'http://127.0.0.1:{port}',
       },
     },
   };
diff --git a/assets-with-umi/test/app/controller/home.test.js b/assets-with-umi/test/app/controller/home.test.js
index 625d50e..6d9e156 100644
--- a/assets-with-umi/test/app/controller/home.test.js
+++ b/assets-with-umi/test/app/controller/home.test.js
@@ -16,7 +16,7 @@ describe('test/app/controller/home.test.js', () => {
   it('should GET /', async function() {
     return app.httpRequest()
       .get('/')
-      .expect(/http:\/\/127.0.0.1:8000\/umi.js/)
+      .expect(/http:\/\/127.0.0.1:10000\/umi.js/)
       .expect(200);
   });