diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 00000000000..3671b1d78a0
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,15 @@
+teams/cli:
+- changed-files:
+  - any-glob-to-any-file: 'docker/**/*'
+
+team/docs:
+- changed-files:
+  - any-glob-to-any-file: 'app/docs/**/*'
+
+teams/frontend:
+- changed-files:
+  - any-glob-to-any-file: 'apps/studio/**/*'
+
+teams/website:
+- changed-files:
+  - any-glob-to-any-file: 'apps/www/**/*'
diff --git a/.github/workflows/label-external-prs.yml b/.github/workflows/label-external-prs.yml
new file mode 100644
index 00000000000..bf1c665033c
--- /dev/null
+++ b/.github/workflows/label-external-prs.yml
@@ -0,0 +1,50 @@
+name: Auto Label PRs
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+jobs:
+  check-external:
+    runs-on: ubuntu-latest
+    outputs:
+      result: ${{ steps.is-member.outputs.result }}
+    steps:
+    - name: Get deps
+      run: |
+        sudo apt-get update && sudo apt-get install -y jq
+    - name: Get org members
+      id: is-member
+      env:
+        GH_ORG: supabase
+        GH_USER: ${{ github.event.pull_request.user.login }}
+        GH_TOKEN: ${{ secrets.GH_ORG_MEMBERSHIP_PAT }}
+      run: |
+        gh api /orgs/supabase/members/$GH_USER
+    - if: failure()
+      name: is-member
+      run: |
+        echo "User is not a member of Supabase org"
+        echo "result=false" >> $GH_OUTPUT
+    - if: success()
+      run: |
+        echo "User is a member of Supabase org, not applying labels"
+    - name: Label contributor
+      id: label-contributor
+      if:  ${{ steps.is-member.outputs.result == 'false' }}
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        USERNAME: ${{ github.event.pull_request.user.login }}
+        GH_REPO: ${{ github.repository }}
+        NUMBER: ${{ github.event.pull_request.number }}
+        LABELS: contributor
+      run: |
+        gh pr edit $NUMBER --add-label $LABELS
+    - uses: actions/checkout@v4
+      if:  ${{ steps.is-member.outputs.result == 'false' }}
+    - name: Label PR
+      if:  ${{ steps.is-member.outputs.result == 'false' }}
+      uses: actions/labeler@v5
+    
+    
+
+
+      
\ No newline at end of file