diff --git a/.github/workflows/test-and-release.yaml b/.github/workflows/test-and-release.yaml
index 3e5d133..9ebc436 100644
--- a/.github/workflows/test-and-release.yaml
+++ b/.github/workflows/test-and-release.yaml
@@ -28,7 +28,9 @@ jobs:
         run: yarn run semantic-release
       - name: Build Storybook
         run: yarn storybook:export
-      - name: Install Surge
-        run: npm install -g surge
-      - name: Deploy Storybook to Surge
-        run: surge ./storybook-static/ konveyor-lib-ui.surge.sh --token 62bd7a07b9bf812ff8d3ea91ccd2dc2f
+      - name: Deploy Storybook to GitHub Pages
+        uses: JamesIves/github-pages-deploy-action@3.7.1
+        with:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          BRANCH: gh-pages
+          FOLDER: storybook-static
diff --git a/README.md b/README.md
index ce57466..cb0cccf 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ The React components in this library are compositions and extensions of [pattern
 
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
 
-Documentation and examples (Storybook): http://konveyor-lib-ui.surge.sh/
+Documentation and examples (Storybook): http://konveyor.github.io/lib-ui/
 
 ## Usage