diff --git a/.github/workflows/webapp.yml b/.github/workflows/webapp.yml
index 35f2e84c..dc346694 100644
--- a/.github/workflows/webapp.yml
+++ b/.github/workflows/webapp.yml
@@ -12,7 +12,7 @@ concurrency:
 
 jobs:
   build-and-deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
@@ -21,7 +21,15 @@ jobs:
         run: npm install
         working-directory: ./joyboy-webapp
 
+      # Build step with working directory set to ./crates/wasm/app
+      # NODE_OPTIONS=--openssl-legacy-provider is required for the build step to work
+      - name: Build
+        run: NODE_OPTIONS=--openssl-legacy-provider npm run build
+        working-directory: ./joyboy-webapp
+
       # Deploy step
       - name: Deploy
-        run: npm run deploy
-        working-directory: ./joyboy-webapp
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./joyboy-webapp/build
diff --git a/joyboy-webapp/package.json b/joyboy-webapp/package.json
index 3a076b01..b112caae 100644
--- a/joyboy-webapp/package.json
+++ b/joyboy-webapp/package.json
@@ -2,7 +2,6 @@
   "name": "joyboy-webapp",
   "version": "0.1.0",
   "private": true,
-  "homepage": "https://keep-starknet-strange.github.io/joyboy/",
   "dependencies": {
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
@@ -21,9 +20,7 @@
     "start": "react-scripts start",
     "build": "react-scripts build",
     "test": "react-scripts test",
-    "eject": "react-scripts eject",
-    "predeploy": "npm run build",
-    "deploy": "gh-pages -d build"
+    "eject": "react-scripts eject"
   },
   "eslintConfig": {
     "extends": [