diff --git a/.github/workflows/website-deploy.yml b/.github/workflows/website-deploy.yml
index 20eea4288a9..da2d4228f51 100644
--- a/.github/workflows/website-deploy.yml
+++ b/.github/workflows/website-deploy.yml
@@ -8,6 +8,10 @@ on:
             - 'apps/web-roo-code/**'
     workflow_dispatch:
 
+concurrency:
+    group: deploy-roocode-com
+    cancel-in-progress: true
+
 env:
     VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
     VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
@@ -36,8 +40,17 @@ jobs:
               uses: actions/checkout@v4
             - name: Setup Node.js and pnpm
               uses: ./.github/actions/setup-node-pnpm
+            - name: Run lint
+              run: pnpm lint
+              working-directory: apps/web-roo-code
+            - name: Run type check
+              run: pnpm check-types
+              working-directory: apps/web-roo-code
+            - name: Run build
+              run: pnpm build
+              working-directory: apps/web-roo-code
             - name: Install Vercel CLI
-              run: npm install --global vercel@canary
+              run: npm install --global vercel@latest
             - name: Pull Vercel Environment Information
               run: npx vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}
             - name: Build Project Artifacts
diff --git a/.github/workflows/website-preview.yml b/.github/workflows/website-preview.yml
index 65cf3e54189..9446bc77531 100644
--- a/.github/workflows/website-preview.yml
+++ b/.github/workflows/website-preview.yml
@@ -11,6 +11,10 @@ on:
             - "apps/web-roo-code/**"
     workflow_dispatch:
 
+concurrency:
+    group: preview-roocode-com-${{ github.ref }}
+    cancel-in-progress: true
+
 env:
     VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
     VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
@@ -39,8 +43,17 @@ jobs:
               uses: actions/checkout@v4
             - name: Setup Node.js and pnpm
               uses: ./.github/actions/setup-node-pnpm
+            - name: Run lint
+              run: pnpm lint
+              working-directory: apps/web-roo-code
+            - name: Run type check
+              run: pnpm check-types
+              working-directory: apps/web-roo-code
+            - name: Run build
+              run: pnpm build
+              working-directory: apps/web-roo-code
             - name: Install Vercel CLI
-              run: npm install --global vercel@canary
+              run: npm install --global vercel@latest
             - name: Pull Vercel Environment Information
               run: npx vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
             - name: Build Project Artifacts