diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 6e6b3562..dd4dea38 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -35,6 +35,7 @@ jobs:
       - run: npm ci
       - run: npm run make
       - run: npm run coverage
+      - run: npm run docs
       - name: Coveralls
         uses: coverallsapp/github-action@v2
         with:
@@ -45,12 +46,11 @@ jobs:
         uses: actions/jekyll-build-pages@v1
         with:
           source: ./docs
-          destination: ./docs/_site
-      - run: npm run docs
+          destination: ./_site
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v1
         with:
-          path: ./docs/_site
+          path: ./_site
 
   # Deploy job
   deploy:
diff --git a/.gitignore b/.gitignore
index 4471f3c9..ef633058 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,7 @@ node_modules/
 coverage/
 dist/
 esm/
-docs/_site/
-docs/api/
+_site/
 *.log
 .nyc_output
 .DS_Store
diff --git a/docs/_config.yml b/docs/_config.yml
index 47a6cc74..07808dec 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -5,3 +5,4 @@ baseurl: ""
 google_analytics: UA-40774777-5
 plugins:
   - jekyll-seo-tag
+keep_files: [api]
\ No newline at end of file
diff --git a/package.json b/package.json
index 04fb26f4..c588ff64 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "watch:core": "lerna run watch --scope imask --stream",
     "watch:vue": "lerna run watch --scope vue-imask --stream",
     "watch:react": "lerna run watch --scope react-imask --stream",
-    "watch:docs": "bundle exec jekyll serve --livereload --source docs --destination docs/_site"
+    "watch:docs": "npm run docs && bundle exec jekyll serve --livereload --source docs --destination _site"
   },
   "collective": {
     "type": "opencollective",
diff --git a/typedoc.json b/typedoc.json
index 14b88d9e..3c85d5fc 100644
--- a/typedoc.json
+++ b/typedoc.json
@@ -3,5 +3,5 @@
   "name": "IMask",
   "entryPointStrategy": "packages",
   "includeVersion": true,
-  "out": "./docs/_site/api"
+  "out": "./_site/api"
 }