diff --git a/package.json b/package.json
index 446d7ea1f9..563e397ef7 100644
--- a/package.json
+++ b/package.json
@@ -12,12 +12,12 @@
     "start:v1": "yarn workspace docusaurus-1-website start",
     "start:v2": "yarn workspace docusaurus-2-website start",
     "start:v2:watch": "nodemon --watch \"./packages/*/lib/**/*.*\" --exec \"yarn start:v2\"",
-    "start:v2:baseUrl": "BASE_URL='/build/' yarn start:v2",
+    "start:v2:baseUrl": "yarn workspace docusaurus-2-website start:baseUrl",
     "build": "yarn build:packages && yarn build:v2",
     "build:packages": "lerna run build --no-private",
     "build:v1": "yarn workspace docusaurus-1-website build",
     "build:v2": "yarn workspace docusaurus-2-website build",
-    "build:v2:baseUrl": "BASE_URL='/build/' yarn build:v2",
+    "build:v2:baseUrl": "yarn workspace docusaurus-2-website build:baseUrl",
     "serve:v1": "serve website-1.x/build/docusaurus",
     "serve:v2": "serve website/build",
     "serve:v2:baseUrl": "serve website",
@@ -25,11 +25,6 @@
     "serve:v2:ssl:gencert": "openssl req -x509 -nodes -days 365 -newkey rsa:4096 -subj \"/C=US/ST=Docusaurus/L=Anywhere/O=Dis/CN=localhost\" -keyout ./website/.docusaurus/selfsigned.key -out ./website/.docusaurus/selfsigned.crt",
     "serve:v2:ssl:message": "echo '\n\n\nServing Docusaurus with HTTPS on localhost requires to disable the Chrome security: chrome://flags/#allow-insecure-localhost\n\n\n'",
     "serve:v2:ssl:serve": "serve website/build --ssl-cert ./website/.docusaurus/selfsigned.crt --ssl-key ./website/.docusaurus/selfsigned.key",
-    "netlify:build:production": "yarn build:v2",
-    "netlify:build:deployPreview": "yarn build:v2:baseUrl && yarn netlify:build:deployPreview:moveBuild && yarn netlify:build:deployPreview:redirects",
-    "netlify:build:deployPreview:moveBuild": "yarn rimraf website/netlifyDeploy && mkdir website/netlifyDeploy && mv website/build website/netlifyDeploy",
-    "netlify:build:deployPreview:redirects": "echo 'Writing Netlify baseUrl deployPreview _redirects file' && echo '/build/* /build/404.html 200' >> website/netlifyDeploy/_redirects && echo '/* /build/' >> website/netlifyDeploy/_redirects",
-    "netlify:test": "yarn netlify:build:deployPreview && yarn netlify dev --debug",
     "changelog": "lerna-changelog",
     "postinstall": "yarn build:packages",
     "prettier": "prettier --config .prettierrc --write \"**/*.{js,ts}\"",
diff --git a/netlify.toml b/website/netlify.toml
similarity index 81%
rename from netlify.toml
rename to website/netlify.toml
index 17d32b34a6..4e6e503acc 100644
--- a/netlify.toml
+++ b/website/netlify.toml
@@ -4,13 +4,13 @@
 # default/production build
 [build]
   base = "/"
-  command = "yarn netlify:build:production"
+  command = "yarn workspace docusaurus-2-website netlify:build:production"
   publish = "website/build"
 
 # we build deploy previews with a /build/ baseUrl on purpose
 # permits to test that baseUrl works fine (this often breaks!)
 [context.deploy-preview]
-  command = "yarn netlify:build:deployPreview"
+  command = "yarn workspace docusaurus-2-website netlify:build:deployPreview"
   publish = "website/netlifyDeploy"
 
   # TODO this does not seem to work
diff --git a/website/package.json b/website/package.json
index 74c95eb770..d1e02c5d34 100644
--- a/website/package.json
+++ b/website/package.json
@@ -6,7 +6,14 @@
     "start": "docusaurus start",
     "build": "docusaurus build",
     "swizzle": "docusaurus swizzle",
-    "deploy": "docusaurus deploy"
+    "deploy": "docusaurus deploy",
+    "start:baseUrl": "BASE_URL='/build/' yarn start",
+    "build:baseUrl": "BASE_URL='/build/' yarn build",
+    "netlify:build:production": "yarn build",
+    "netlify:build:deployPreview": "yarn build:baseUrl && yarn netlify:build:deployPreview:moveBuild && yarn netlify:build:deployPreview:redirects",
+    "netlify:build:deployPreview:moveBuild": "yarn rimraf netlifyDeploy && mkdir netlifyDeploy && mv build netlifyDeploy",
+    "netlify:build:deployPreview:redirects": "echo 'Writing Netlify baseUrl deployPreview _redirects file' && echo '/build/* /build/404.html 200' >> netlifyDeploy/_redirects && echo '/* /build/' >> netlifyDeploy/_redirects",
+    "netlify:test": "yarn netlify:build:deployPreview && yarn netlify dev --debug"
   },
   "dependencies": {
     "@docusaurus/core": "^2.0.0-alpha.58",