diff --git a/bin/tessereact-ci.js b/bin/tessereact-ci.js
index 0e4cff8..0d89e21 100644
--- a/bin/tessereact-ci.js
+++ b/bin/tessereact-ci.js
@@ -76,11 +76,21 @@ choosePorts(HOST, DEFAULT_PORT)
     // Load proxy config
     const proxySetting = require(paths.appPackageJson).proxy
     const proxyConfig = prepareProxy(proxySetting, paths.appPublic)
+
     // Serve webpack assets generated by the compiler over a web sever.
-    const serverConfig = createDevServerConfig(
-      proxyConfig,
-      urls.lanUrlForConfig
+    const serverConfig = Object.assign(
+      {},
+      createDevServerConfig(
+        proxyConfig,
+        urls.lanUrlForConfig
+      ),
+      {
+        headers: {
+          'Access-Control-Allow-Origin': '*'
+        }
+      }
     )
+
     const devServer = new WebpackDevServer(compiler, serverConfig)
     // Launch WebpackDevServer.
     devServer.listen(webpackPort, HOST, err => {
@@ -98,7 +108,8 @@ choosePorts(HOST, DEFAULT_PORT)
       const tessereactConfig = Object.assign({}, {
         port: serverPort,
         snapshotsPath: 'snapshots',
-        entryURL: url.resolve(urls.localUrlForBrowser, 'static/js/tessereact.js')
+        entryURL: url.resolve(urls.localUrlForBrowser, 'static/js/tessereact.js'),
+        staticURL: urls.localUrlForBrowser
       }, userConfig)
 
       tessereactServer(process.cwd(), tessereactConfig)
diff --git a/bin/tessereact-start.js b/bin/tessereact-start.js
index c613d6c..ffaa743 100644
--- a/bin/tessereact-start.js
+++ b/bin/tessereact-start.js
@@ -78,11 +78,21 @@ choosePorts(HOST, DEFAULT_PORT)
     // Load proxy config
     const proxySetting = require(paths.appPackageJson).proxy
     const proxyConfig = prepareProxy(proxySetting, paths.appPublic)
+
     // Serve webpack assets generated by the compiler over a web sever.
-    const serverConfig = createDevServerConfig(
-      proxyConfig,
-      urls.lanUrlForConfig
+    const serverConfig = Object.assign(
+      {},
+      createDevServerConfig(
+        proxyConfig,
+        urls.lanUrlForConfig
+      ),
+      {
+        headers: {
+          'Access-Control-Allow-Origin': '*'
+        }
+      }
     )
+
     const devServer = new WebpackDevServer(compiler, serverConfig)
     // Launch WebpackDevServer.
     devServer.listen(webpackPort, HOST, err => {
@@ -103,7 +113,8 @@ choosePorts(HOST, DEFAULT_PORT)
       const tessereactConfig = Object.assign({}, {
         port: serverPort,
         snapshotsPath: 'snapshots',
-        entryURL: url.resolve(urls.localUrlForBrowser, 'static/js/tessereact.js')
+        entryURL: url.resolve(urls.localUrlForBrowser, 'static/js/tessereact.js'),
+        staticURL: urls.localUrlForBrowser
       }, userConfig)
 
       tessereactServer(process.cwd(), tessereactConfig, () => {