diff --git a/.github/workflows/devlop-deploy-netlify.yml b/.github/workflows/devlop-deploy-netlify.yml
index ce6438d..b66cc7a 100644
--- a/.github/workflows/devlop-deploy-netlify.yml
+++ b/.github/workflows/devlop-deploy-netlify.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v3
         with:
-          version: '8.15.7'
+          version: "8.15.7"
       - name: Install rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
       - name: Install wasm-pack
@@ -45,19 +45,32 @@ jobs:
         uses: actions/upload-pages-artifact@v3
         with:
           path: www/dist
+
       - name: Deploy to Netlify
-        uses: jsmrcaga/action-netlify-deploy@v2.0.0
+        id: netlify-deploy
+        uses: nwtgck/actions-netlify@v3.0
         with:
+          publish-dir: "www/dist"
+          production-branch: develop
+          production-deploy: true
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          deploy-message: Deployed Develop
+          enable-pull-request-comment: true
+          enable-commit-comment: false
+          overwrites-pull-request-comment: true
+          alias: deploy-preview-${{ github.event.number }}
+        env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_TOKEN_SECRET }}
           NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
-          NETLIFY_DEPLOY_TO_PROD: true
-          install_command: "echo Skipping installing the dependencies"
-          build_command: "echo Skipping building the web files"
-          build_directory: www/dist
-      - name: Status check
-        uses: Sibz/github-status-action@v1.1.1
+        timeout-minutes: 2
+      - run: echo netlify URL ${{ steps.netlify-deploy.outputs.deploy-url }}
+
+      - name: Update commit status for non-default branches
+        uses: Sibz/github-status-action@v1
         with:
           authToken: ${{ secrets.GITHUB_TOKEN }}
-          context: Netlify preview
-          state: success
-          target_url: ${{ env.NETLIFY_PREVIEW_URL }}
+          context: "Netlify"
+          description: "Preview Deployed"
+          state: "success"
+          target_url: ${{ steps.netlify-deploy.outputs.deploy-url }}
+          sha: ${{github.event.pull_request.head.sha || github.sha}}
diff --git a/.github/workflows/pull_request_deploy_preview.yml b/.github/workflows/pull_request_deploy_preview.yml
index 919e1ea..eb891be 100644
--- a/.github/workflows/pull_request_deploy_preview.yml
+++ b/.github/workflows/pull_request_deploy_preview.yml
@@ -1,8 +1,7 @@
-
 name: netlify deploy-preview
 on:
   pull_request:
-    types: ['opened', 'edited', 'synchronize']
+    types: ["opened", "edited", "synchronize"]
     branches:
       - develop
       - "!main"
@@ -23,7 +22,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v3
         with:
-          version: '8.15.7'
+          version: "8.15.7"
       - name: Install rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
       - name: Install wasm-pack
@@ -48,18 +47,31 @@ jobs:
         uses: actions/upload-pages-artifact@v3
         with:
           path: www/dist
+
       - name: Deploy to Netlify
+        id: netlify-deploy
         uses: nwtgck/actions-netlify@v3.0
         with:
-          publish-dir: 'www/dist'
+          publish-dir: "www/dist"
           production-branch: develop
           github-token: ${{ secrets.GITHUB_TOKEN }}
           deploy-message: ${{ github.event.pull_request.title }}
           enable-pull-request-comment: true
-          enable-commit-comment: true
+          enable-commit-comment: false
           overwrites-pull-request-comment: true
           alias: deploy-preview-${{ github.event.number }}
         env:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_TOKEN_SECRET }}
           NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
-        timeout-minutes: 1
+        timeout-minutes: 2
+      - run: echo netlify URL ${{ steps.netlify-deploy.outputs.deploy-url }}
+
+      - name: Update commit status for non-default branches
+        uses: Sibz/github-status-action@v1
+        with:
+          authToken: ${{ secrets.GITHUB_TOKEN }}
+          context: "Netlify"
+          description: "Preview Deployed"
+          state: "success"
+          target_url: ${{ steps.netlify-deploy.outputs.deploy-url }}
+          sha: ${{github.event.pull_request.head.sha || github.sha}}