diff --git a/.github/quarkus-github-bot.yml b/.github/quarkus-github-bot.yml
index b23b4dc8a2..cb1f001c6c 100644
--- a/.github/quarkus-github-bot.yml
+++ b/.github/quarkus-github-bot.yml
@@ -1,6 +1,15 @@
 ---
 # The format of this file is documented here:
 # https://github.com/quarkusio/quarkus-bot#triage-issues
-features: [ANALYZE_WORKFLOW_RUN_RESULTS]
+features: [ANALYZE_WORKFLOW_RUN_RESULTS,TRIAGE_ISSUES_AND_PULL_REQUESTS,SET_AREA_LABEL_COLOR]
 workflowRunAnalysis:
   workflows: ["Pull Request Build - development"]
+triage:
+  rules:
+    - id: amazon
+      labels: [area/amazon-services]
+      title: "amazon"
+      notify: [scrocquesel]
+      notifyInPullRequest: true
+      files:
+        - 'amazon-*/**'
diff --git a/.github/workflows/quarkus-github-bot-lint.yml b/.github/workflows/quarkus-github-bot-lint.yml
new file mode 100644
index 0000000000..7a01f94ebc
--- /dev/null
+++ b/.github/workflows/quarkus-github-bot-lint.yml
@@ -0,0 +1,22 @@
+name: quarkus-github-bot.yml lint
+
+on:
+  push:
+    paths:
+      - '.github/quarkus-github-bot.yml'
+  pull_request:
+    paths:
+      - '.github/quarkus-github-bot.yml'
+
+jobs:
+  lint:
+    name: "quarkus-github-bot.yml validation"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: install yamllint
+        shell: bash
+        run: sudo apt-get install -y yamllint
+      - name: run yamllint for quarkus-github-bot.yml
+        shell: bash
+        run: yamllint -c .github/yamllint.conf .github/quarkus-github-bot.yml
diff --git a/.github/yamllint.conf b/.github/yamllint.conf
new file mode 100644
index 0000000000..1b6be046eb
--- /dev/null
+++ b/.github/yamllint.conf
@@ -0,0 +1,5 @@
+extends: default
+
+rules:
+  line-length: disable
+  commas: disable