diff --git a/gulpfile.js b/gulpfile.js
index 647abb6d2..3ca0c65de 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -318,7 +318,7 @@ function createTasksForBuildJsExtension({ buildJsFiles, taskPrefix, devMode, bun
 function createTasksForBuildJsMascara({ taskPrefix, devMode, bundleTaskOpts = {} }) {
   // inpage must be built before all other scripts:
   const rootDir = './mascara/src/'
-  const buildPhase1 = ['ui', 'proxy', 'background']
+  const buildPhase1 = ['ui', 'proxy', 'background', 'metamascara']
   const destinations = ['./dist/mascara']
   bundleTaskOpts = Object.assign({
     buildSourceMaps: true,
diff --git a/mascara/server/index.js b/mascara/server/index.js
index 2bc2441d0..2f3a7a5ff 100644
--- a/mascara/server/index.js
+++ b/mascara/server/index.js
@@ -9,23 +9,10 @@ module.exports = createMetamascaraServer
 
 function createMetamascaraServer () {
 
-  // start bundlers
-  const metamascaraBundle = createBundle(path.join(__dirname, '/../src/mascara.js'))
-  const proxyBundle = createBundle(path.join(__dirname, '/../src/proxy.js'))
-  const uiBundle = createBundle(path.join(__dirname, '/../src/ui.js'))
-  const backgroundBuild = createBundle(path.join(__dirname, '/../src/background.js'))
-
   // setup server
   const server = express()
   server.use(compression())
 
-  // serve bundles
-  serveBundle(server, '/metamascara.js', metamascaraBundle)
-  serveBundle(server, '/scripts/ui.js', uiBundle)
-  serveBundle(server, '/scripts/proxy.js', proxyBundle)
-  // the serviceworker must be served from the root of the app
-  serveBundle(server, '/background.js', backgroundBuild)
-
   // serve assets
   server.use(express.static(path.join(__dirname, '/../ui/'), { setHeaders: (res) => res.set('X-Frame-Options', 'DENY') }))
   server.use(express.static(path.join(__dirname, '/../../dist/mascara')))
diff --git a/mascara/src/mascara.js b/mascara/src/metamascara.js
similarity index 100%
rename from mascara/src/mascara.js
rename to mascara/src/metamascara.js