diff --git a/.github/workflows/deploy-bridge-dapp-dev.yml b/.github/workflows/deploy-bridge-dapp-dev.yml
index d9044f5063..2bec9af084 100644
--- a/.github/workflows/deploy-bridge-dapp-dev.yml
+++ b/.github/workflows/deploy-bridge-dapp-dev.yml
@@ -57,7 +57,7 @@ jobs:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
           NETLIFY_SITE_ID: ${{ secrets.NETLIFY_BRIDGE_SITE_ID }}
         with:
-          args: deploy context=deploy-preview site=$NETLIFY_BRIDGE_SITE_ID --dir=./dist/apps/bridge-dapp/
+          args: deploy context=deploy-preview site=$NETLIFY_BRIDGE_SITE_ID --dir=./dist/apps/bridge-dapp/ --filter=@webb-tools/bridge-dapp
 
       - name: Netlify Preview URL
         # Use master branch to fix issue with entrypoint.sh script
diff --git a/.github/workflows/deploy-faucet.yml b/.github/workflows/deploy-faucet.yml
index ddb400dd6a..7fce16b55f 100644
--- a/.github/workflows/deploy-faucet.yml
+++ b/.github/workflows/deploy-faucet.yml
@@ -49,9 +49,6 @@ jobs:
           echo NEXT_PUBLIC_TWITTER_CLIENT_ID=${{ secrets.NEXT_PUBLIC_TWITTER_CLIENT_ID }} >> .env
           echo TWITTER_CLIENT_SECRET=${{ secrets.TWITTER_CLIENT_SECRET }} >> .env
 
-      - name: Install netlify-cli
-        run: yarn add -D -W netlify-cli
-
       - name: Build project
         # Fix: JavaScript heap out of memory
         # https://github.com/actions/runner-images/issues/70#issuecomment-1191708172
@@ -63,7 +60,7 @@ jobs:
         id: deploy-netlify
         shell: bash
         run: |
-          COMMAND=$(echo "npx netlify deploy --build context=deploy-preview --site $NETLIFY_FAUCET_ID --auth $NETLIFY_AUTH_TOKEN --dir=./dist/apps/faucet/.next" )
+          COMMAND=$(echo "yarn netlify deploy --build context=deploy-preview --site $NETLIFY_FAUCET_ID --auth $NETLIFY_AUTH_TOKEN --dir=./dist/apps/faucet/.next --filter=@webb-tools/faucet" )
           OUTPUT=$(sh -c "$COMMAND")
           echo "response<<EOF" >> $GITHUB_OUTPUT
           echo "$OUTPUT" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/deploy-hubble-stats.yml b/.github/workflows/deploy-hubble-stats.yml
index 8fbb2bfdfe..ff4424c129 100644
--- a/.github/workflows/deploy-hubble-stats.yml
+++ b/.github/workflows/deploy-hubble-stats.yml
@@ -42,9 +42,6 @@ jobs:
       - name: Install dependencies
         run: yarn install
 
-      - name: Install netlify-cli
-        run: yarn add -D -W netlify-cli
-
       - name: Build project
         # Fix: JavaScript heap out of memory
         # https://github.com/actions/runner-images/issues/70#issuecomment-1191708172
@@ -56,7 +53,7 @@ jobs:
         id: deploy-netlify
         shell: bash
         run: |
-          COMMAND=$(echo "npx netlify deploy --build context=deploy-preview --site $NETLIFY_HUBBLE_STATS_ID --auth $NETLIFY_AUTH_TOKEN --dir=./dist/apps/hubble-stats/.next" )
+          COMMAND=$(echo "yarn netlify deploy --build context=deploy-preview --site $NETLIFY_HUBBLE_STATS_ID --auth $NETLIFY_AUTH_TOKEN --dir=./dist/apps/hubble-stats/.next --filter=@webb-tools/hubble-stats" )
           OUTPUT=$(sh -c "$COMMAND")
           echo "response<<EOF" >> $GITHUB_OUTPUT
           echo "$OUTPUT" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/deploy-stats-dapp-dev.yml b/.github/workflows/deploy-stats-dapp-dev.yml
index 99d25a9372..0483f620f9 100644
--- a/.github/workflows/deploy-stats-dapp-dev.yml
+++ b/.github/workflows/deploy-stats-dapp-dev.yml
@@ -47,7 +47,7 @@ jobs:
           NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
           NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
         with:
-          args: deploy context=deploy-preview site=$NETLIFY_SITE_ID --dir=./dist/apps/stats-dapp/
+          args: deploy context=deploy-preview site=$NETLIFY_SITE_ID --dir=./dist/apps/stats-dapp/ --filter=@webb-tools/stats-dapp
 
       - name: Netlify Preview URL
         # Use master branch to fix issue with entrypoint.sh script
diff --git a/.github/workflows/deploy-tangle-website.yml b/.github/workflows/deploy-tangle-website.yml
index 5437f88678..73e20d1573 100644
--- a/.github/workflows/deploy-tangle-website.yml
+++ b/.github/workflows/deploy-tangle-website.yml
@@ -50,9 +50,6 @@ jobs:
           echo NOTION_TOKEN_V2=${{ secrets.NOTION_TOKEN_V2 }} >> .env
           echo NOTION_ACTIVE_USER=${{ secrets.NOTION_ACTIVE_USER }} >> .env
 
-      - name: Install netlify-cli
-        run: yarn add -D -W netlify-cli
-
       - name: Build project
         # Fix: JavaScript heap out of memory
         # https://github.com/actions/runner-images/issues/70#issuecomment-1191708172
@@ -64,7 +61,7 @@ jobs:
         id: deploy-netlify
         shell: bash
         run: |
-          COMMAND=$(echo "npx netlify deploy --build context=deploy-preview --site $NETLIFY_TANGLE_ID --auth $NETLIFY_AUTH_TOKEN --dir=./dist/apps/tangle-website/.next" )
+          COMMAND=$(echo "yarn netlify deploy --build context=deploy-preview --site $NETLIFY_TANGLE_ID --auth $NETLIFY_AUTH_TOKEN --dir=./dist/apps/tangle-website/.next --filter=@webb-tools/tangle-website" )
           OUTPUT=$(sh -c "$COMMAND")
           echo "response<<EOF" >> $GITHUB_OUTPUT
           echo "$OUTPUT" >> $GITHUB_OUTPUT
diff --git a/.github/workflows/deploy-webbsite-dev.yml b/.github/workflows/deploy-webbsite-dev.yml
index df924e3445..c387d32b21 100644
--- a/.github/workflows/deploy-webbsite-dev.yml
+++ b/.github/workflows/deploy-webbsite-dev.yml
@@ -53,9 +53,6 @@ jobs:
           echo NOTION_BLOG_INTEGRATION_TOKEN=${{ secrets.NOTION_BLOG_INTEGRATION_TOKEN }} >> .env
           echo NOTION_BLOG_INTEGRATION_VIDEOS_DATABASE_ID=${{ secrets.NOTION_BLOG_INTEGRATION_VIDEOS_DATABASE_ID }} >> .env
 
-      - name: Install netlify-cli
-        run: yarn add -D -W netlify-cli
-
       - name: Build project
         # Fix: JavaScript heap out of memory
         # https://github.com/actions/runner-images/issues/70#issuecomment-1191708172
@@ -67,7 +64,7 @@ jobs:
         id: deploy-netlify
         shell: bash
         run: |
-          COMMAND=$(echo "npx netlify deploy --build context=deploy-preview --site $NETLIFY_WEBBSITE_ID --auth $NETLIFY_AUTH_TOKEN --dir=./dist/apps/webbsite/.next" )
+          COMMAND=$(echo "yarn netlify deploy --build context=deploy-preview --site $NETLIFY_WEBBSITE_ID --auth $NETLIFY_AUTH_TOKEN --dir=./dist/apps/webbsite/.next --filter=@webb-tools/webbsite" )
           OUTPUT=$(sh -c "$COMMAND")
           echo "response<<EOF" >> $GITHUB_OUTPUT
           echo "$OUTPUT" >> $GITHUB_OUTPUT