diff --git a/package.json b/package.json
index 8eea3ca247..37c6e9d7a3 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
     "css-loader": "^2.1.0",
     "eslint": "^5.16.0",
     "file-loader": "^3.0.1",
+    "html-webpack-plugin": "^3.2.0",
     "style-loader": "^0.23.1",
     "webpack": "^4.41.0",
     "webpack-cli": "^3.3.9",
diff --git a/src/index.html b/src/index.html
index d95784a3dc..a363a36e1f 100644
--- a/src/index.html
+++ b/src/index.html
@@ -102,5 +102,6 @@
     <div class="skinHeader focuscontainer-x"></div>
     <div class="mainAnimatedPages skinBody"></div>
     <div class="mainDrawerHandle"></div>
+    <%= htmlWebpackPlugin.options.appLoader %>
 </body>
 </html>
diff --git a/webpack.dev.js b/webpack.dev.js
index 99d7bb1b4a..cc7fc259a1 100644
--- a/webpack.dev.js
+++ b/webpack.dev.js
@@ -1,6 +1,7 @@
 const path = require("path");
 const common = require("./webpack.common");
 const merge = require("webpack-merge");
+var HtmlWebpackPlugin = require('html-webpack-plugin');
 
 module.exports = merge(common, {
     mode: "development",
@@ -21,4 +22,18 @@ module.exports = merge(common, {
             }
         ]
     },
+    plugins: [
+        new HtmlWebpackPlugin({
+            appLoader: '<script>window.dashboardVersion="0.0.0";</script><script src="scripts/apploader.js?v=0.0.0" defer></script></body>',
+            filename: 'index.html',
+            template: 'index.html'
+        })
+    ],
+    devServer: {
+        proxy: {
+            "!/**/*.html" : "http://localhost:8096",
+            "!/**/*.css" : "http://localhost:8086",
+            "!/**/*.js" : "http://localhost:8086"
+        }
+    }
 });
diff --git a/yarn.lock b/yarn.lock
index cb8cd3e4f4..025dd2ec03 100644
Binary files a/yarn.lock and b/yarn.lock differ