diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml
index fb939724..31fbc4d9 100644
--- a/.github/workflows/cypress.yml
+++ b/.github/workflows/cypress.yml
@@ -27,17 +27,17 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node_modules-build-
 
-      - name: Lint
+      - name: Build & Lint
         run: |
           yarn install
-          yarn run lint
+          yarn build
+          yarn lint
 
       # Install NPM dependencies, cache them correctly
       # and run all Cypress tests
       - name: Cypress run
         uses: cypress-io/github-action@v2
         with:
-          build: yarn build
           start: yarn preview
           wait-on: 'http://localhost:3000'
           record: true
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 5abf2e9b..4fcc1903 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -23,7 +23,6 @@ jobs:
         run: |
           npm i -g yarn
           export DEPLOY=true
-          [ "$GITHUB_EVENT_NAME" == "pull_request" ] && export BETA=true && rm -rf docs/beta/
           [ "$GITHUB_EVENT_NAME" != "pull_request" ] && rm -rf docs/_app/
           yarn install
           version=$(yarn version --patch --no-git-tag-version | grep "New version" | cut -d':' -f 2)
diff --git a/svelte.config.js b/svelte.config.js
index 46916306..5cf9bd91 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -12,11 +12,11 @@ const config = {
 	],
 	kit: {
 		adapter: adapter({
-			pages: `docs${process.env['BETA'] ? '/beta' : ''}`
+			pages: `docs`
 		}),
 		paths: process.env['DEPLOY']
 			? {
-					base: `/mermaid-live-editor${process.env['BETA'] ? '/beta' : ''}`
+					base: `/mermaid-live-editor`
 			  }
 			: {},
 		trailingSlash: 'ignore',