diff --git a/launcher.js b/launcher.js
index 9a2df926c..241620882 100644
--- a/launcher.js
+++ b/launcher.js
@@ -1,14 +1,10 @@
 const cypress = require('cypress');
 const helpers = require('./helpers');
-const synpressConfigPath = `${helpers.getSynpressPath()}/synpress.json`;
+const synpressConfigPath = `${helpers.getSynpressPath()}/synpress.config.js`;
 
 process.env.CYPRESS_REMOTE_DEBUGGING_PORT = 9222;
 
-const fixturesFolder = `${helpers.getSynpressPath()}/fixtures`;
-const pluginsFile = `${helpers.getSynpressPath()}/plugins/index.js`;
-const supportFile = `${helpers.getSynpressPath()}/support/index.js`;
-
-const defaultConfig = `fixturesFolder=${fixturesFolder},pluginsFile=${pluginsFile},supportFile=${supportFile}`;
+const defaultConfig = ``;
 
 const defaultArguments = [
   'cypress',
diff --git a/package.json b/package.json
index d09c1da17..01d71b1cf 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "release:patch": "release-it patch --disable-metrics",
     "update:deps": "ncu -u -x 'node-fetch eslint' && npm install --legacy-peer-deps",
     "start:server": "serve tests/test-dapp -p 3000",
-    "test:e2e": "start-server-and-test 'npm run start:server' http-get://localhost:3000 'SYNPRESS_LOCAL_TEST=true node synpress.js run --configFile=tests/e2e/config.json'",
+    "test:e2e": "start-server-and-test 'npm run start:server' http-get://localhost:3000 'SYNPRESS_LOCAL_TEST=true node synpress.js run --configFile=synpress.config.js'",
     "test:e2e:ci": "start-server-and-test 'npm run start:server' http-get://localhost:3000 'SYNPRESS_LOCAL_TEST=true node synpress.js run --group smoke-tests --record'"
   },
   "dependencies": {
diff --git a/plugins/index.js b/plugins/index.js
index 52f74f2c5..50d42b58b 100644
--- a/plugins/index.js
+++ b/plugins/index.js
@@ -265,7 +265,8 @@ module.exports = (on, config) => {
   });
 
   if (process.env.BASE_URL) {
-    config.baseUrl = process.env.BASE_URL;
+    config.e2e.baseUrl = process.env.BASE_URL;
+    config.component.baseUrl = process.env.BASE_URL;
   }
 
   if (process.env.CI) {