diff --git a/.editorconfig b/.editorconfig
index 726f5bb..c359aa9 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -41,3 +41,12 @@ simplify = true
 
 [*.{kt,kts}]
 indent_size = 4
+
+# ktlint configuration
+ktlint_code_style = android_studio
+ktlint_function_naming_ignore_when_annotated_with = Composable
+ktlint_standard_class-signature = disabled
+ktlint_standard_function-expression-body = disabled
+ktlint_standard_mixed-condition-operators = disabled
+ktlint_standard_package-name = disabled
+ktlint_standard_property-naming = disabled
diff --git a/.github/workflows/pull_requests.yaml b/.github/workflows/pull_requests.yaml
index 58d4981..28c0469 100644
--- a/.github/workflows/pull_requests.yaml
+++ b/.github/workflows/pull_requests.yaml
@@ -15,7 +15,7 @@ jobs:
   weblate-automerge:
     runs-on: ubuntu-slim
     name: Weblate automerge
-    if: github.actor == 'weblate'
+    if: github.event.pull_request.user.login == 'weblate' || github.event.pull_request.user.login == 'hosted-weblate[bot]'
     steps:
     - name: Enable Pull Request Automerge
       run: gh pr merge --repo "$GITHUB_REPOSITORY" --rebase --auto "$PR_NUMBER"