diff --git a/.github/auto-label-action-config.json b/.github/auto-label-action-config.json
new file mode 100644
index 000000000000..0967ef424bce
--- /dev/null
+++ b/.github/auto-label-action-config.json
@@ -0,0 +1 @@
+{}
diff --git a/.github/workflows/auto-label.yml b/.github/workflows/auto-label.yml
new file mode 100644
index 000000000000..2a453ccdb4d2
--- /dev/null
+++ b/.github/workflows/auto-label.yml
@@ -0,0 +1,11 @@
+name: 'Auto label QA'
+on:
+  pull_request:
+    types: [opened, synchronize, labeled, unlabeled]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: ggazzo/gh-action-auto-label@beta-5
+        with:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.kodiak.toml b/.kodiak.toml
index bbbfca713a5e..3865c8954586 100644
--- a/.kodiak.toml
+++ b/.kodiak.toml
@@ -1,10 +1,13 @@
 # .kodiak.toml
 version = 1
 
-
 [merge]
 method = "squash"
-automerge_label = ["stat: ready to merge", "QA tested", "automerge"]
+automerge_label = ["stat: ready to merge", "automerge"]
+block_on_neutral_required_check_runs = true
+blocking_labels = ["stat: needs QA", "Invalid PR Title"]
+prioritize_ready_to_merge =  true
+
 
 [merge.message]
 title = "pull_request_title" # default: "github_default"