diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml
index 944daf4498..3c29df1586 100644
--- a/.github/workflows/crowdin.yml
+++ b/.github/workflows/crowdin.yml
@@ -10,16 +10,17 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - name: Checkout
+        uses: actions/checkout@v2
 
-    - name: Checkout
-      uses: actions/checkout@v2
+      - name: crowdin action
+        uses: crowdin/github-action@1.4.0
+        with:
+          upload_translations: true
+          download_translations: true
+          pull_request_labels: "i18n, ♻️ autoupdate"
 
-    - name: crowdin action
-      uses: crowdin/github-action@1.4.0
-      with:
-        upload_translations: true
-        download_translations: true
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
-        CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
diff --git a/.kodiak.toml b/.kodiak.toml
index 34469c1bf1..9aacbb76b5 100644
--- a/.kodiak.toml
+++ b/.kodiak.toml
@@ -4,5 +4,8 @@ version = 1
 autoupdate_label = "♻️ autoupdate"
 
 [approve]
-auto_approve_usernames = ["dependabot", "PeerRich", "baileypumfleet"]
+auto_approve_usernames = ["dependabot", "PeerRich", "baileypumfleet", "github-actions"]
 
+[merge]
+method = "squash"
+automerge_label = ["i18n"]