diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8466ba1758..dabbaf8b07 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -63,25 +63,15 @@ jobs:
         run: |
           git config --global user.email 'action@github.com'
           git config --global user.name 'GitHub Action'
-      # - name: Deploy main
-      #   if: github.ref == 'refs/heads/main'
-      #   run: |
-      #     git fetch origin gh-pages
-      #     git worktree add gh-pages gh-pages
-      #     git rm -r .
-      #     git checkout gh-pages -- canary
-      #     mv ../storybook-static/* .
-      #     git add .
-      #     git commit --allow-empty -m "main storybook deployment"
-      #     git push -f https://adazzle:${{secrets.GITHUB_TOKEN}}@github.com/adazzle/react-data-grid.git
-      - name: Deploy main
+      - name: Deploy gh-pages
         if: github.ref == 'refs/heads/main'
         run: |
           git fetch origin gh-pages
           git worktree add gh-pages gh-pages
           cd gh-pages
-          git rm -r --ignore-unmatch canary
-          mv ../storybook-static canary
-          git add canary
-          git commit --allow-empty -m "beta storybook deployment"
+          git rm -r .
+          git checkout gh-pages -- old
+          mv ../storybook-static/* .
+          git add .
+          git commit -m "gh-pages deployment" || echo "Nothing to commit"
           git push -f https://adazzle:${{secrets.GITHUB_TOKEN}}@github.com/adazzle/react-data-grid.git
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21d609b52f..1c080a858c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -136,7 +136,7 @@
 
 ## v7.0.0-canary.22
 
-- Add Grouping ([PR](https://github.com/adazzle/react-data-grid/pull/2106)). Check the new [example](https://adazzle.github.io/react-data-grid/canary/?path=/story/demos--grouping).
+- Add Grouping ([PR](https://github.com/adazzle/react-data-grid/pull/2106)). Check the new [example](https://adazzle.github.io/react-data-grid/?path=/story/demos--grouping).
 - (Breaking) Removed `height` and `width` props and added new `className` and `style` props. We are now using `ResizeObserver` to calculate all the grid dimensions ([PR](https://github.com/adazzle/react-data-grid/pull/2130))
 - (Breaking) Removed formatterOptions. Grid now handles formatter focus internally so this prop is no longer required ([PR](https://github.com/adazzle/react-data-grid/pull/2138))
 - Added support for React 17
@@ -217,7 +217,7 @@
     - ⚠️ `height`
     - ⚠️ `cellContentRenderer`
     - ⚠️ `contextMenu`
-      - Check the [Context Menu](https://adazzle.github.io/react-data-grid/canary/?path=/story/demos--context-menu) example
+      - Check the [Context Menu](https://adazzle.github.io/react-data-grid/?path=/story/demos--context-menu) example
     - ⚠️ `enableCellSelect`
     - ⚠️ `enableCellAutoFocus`
     - ⚠️ `getValidFilterValues`
diff --git a/README.md b/README.md
index 869b0c3919..da9a3b0603 100644
--- a/README.md
+++ b/README.md
@@ -23,29 +23,29 @@
 - Tree-shaking support and only [one npm dependency](package.json) to keep your bundles slim
 - Great performance thanks to virtualization: columns and rows outside the viewport are not rendered
 - Strictly typed with TypeScript
-- [Keyboard accessibility](<(https://adazzle.github.io/react-data-grid/canary/?path=/story/demos--common-features)>)
+- [Keyboard accessibility](<(https://adazzle.github.io/react-data-grid/?path=/story/demos--common-features)>)
 - Light and dark mode support out of the box. The light or dark themes can be enforced using the `rdg-light` or `rdg-dark` classes.
-- [Frozen columns](https://adazzle.github.io/react-data-grid/canary/?path=/story/demos--common-features)
-- [Column resizing](https://adazzle.github.io/react-data-grid/canary/?path=/story/demos--common-features)
-- [Multi-column sorting](https://adazzle.github.io/react-data-grid/canary/?path=/story/demos--common-features)
+- [Frozen columns](https://adazzle.github.io/react-data-grid/?path=/story/demos--common-features)
+- [Column resizing](https://adazzle.github.io/react-data-grid/?path=/story/demos--common-features)
+- [Multi-column sorting](https://adazzle.github.io/react-data-grid/?path=/story/demos--common-features)
   - Click on a sortable column header to toggle between its ascending/descending sort order
   - Ctrl+Click / Meta+Click to sort an additional column
-- [Column spanning](https://adazzle.github.io/react-data-grid/canary/?path=/story/demos--column-spanning)
-- [Row selection](https://adazzle.github.io/react-data-grid/canary/?path=/story/demos--common-features)
-- [Row grouping](https://adazzle.github.io/react-data-grid/canary/?path=/story/demos--grouping)
-- [Summary rows](https://adazzle.github.io/react-data-grid/canary/?path=/story/demos--common-features)
-- [Dynamic row heights](https://adazzle.github.io/react-data-grid/canary/?path=/story/demos--variable-row-height)
-- [No rows fallback](https://adazzle.github.io/react-data-grid/canary/?path=/story/demos--no-rows)
-- [Cell formatting](https://adazzle.github.io/react-data-grid/canary/?path=/story/demos--common-features)
-- [Cell editing](https://adazzle.github.io/react-data-grid/canary/?path=/story/demos--common-features)
-- [Cell copy / pasting](https://adazzle.github.io/react-data-grid/canary/?path=/story/demos--all-features)
-- [Cell value dragging / filling](https://adazzle.github.io/react-data-grid/canary/?path=/story/demos--all-features)
+- [Column spanning](https://adazzle.github.io/react-data-grid/?path=/story/demos--column-spanning)
+- [Row selection](https://adazzle.github.io/react-data-grid/?path=/story/demos--common-features)
+- [Row grouping](https://adazzle.github.io/react-data-grid/?path=/story/demos--grouping)
+- [Summary rows](https://adazzle.github.io/react-data-grid/?path=/story/demos--common-features)
+- [Dynamic row heights](https://adazzle.github.io/react-data-grid/?path=/story/demos--variable-row-height)
+- [No rows fallback](https://adazzle.github.io/react-data-grid/?path=/story/demos--no-rows)
+- [Cell formatting](https://adazzle.github.io/react-data-grid/?path=/story/demos--common-features)
+- [Cell editing](https://adazzle.github.io/react-data-grid/?path=/story/demos--common-features)
+- [Cell copy / pasting](https://adazzle.github.io/react-data-grid/?path=/story/demos--all-features)
+- [Cell value dragging / filling](https://adazzle.github.io/react-data-grid/?path=/story/demos--all-features)
 
 ## Links
 
-- [Website](https://adazzle.github.io/react-data-grid/canary/)
+- [Examples website](https://adazzle.github.io/react-data-grid/)
   - [Source code](stories)
-- [Old website for react-data-grid v5](https://adazzle.github.io/react-data-grid/)
+- [Old website for react-data-grid v6](https://adazzle.github.io/react-data-grid/old/)
 - [Changelog](CHANGELOG.md)
 - [Contributing](CONTRIBUTING.md)