diff --git a/.github/workflows/pr-clean-old-drafts.yaml b/.github/workflows/pr-clean-old-drafts.yaml
index c02853eb3a..065759fe65 100644
--- a/.github/workflows/pr-clean-old-drafts.yaml
+++ b/.github/workflows/pr-clean-old-drafts.yaml
@@ -3,16 +3,15 @@ name: PR cleanup
 
 on:
   schedule:
-    - cron: "0 7 * * 1"  # every Monday 09:00 CEST (UTC+2)
+    - cron: "0 7 * * 1"  # every Monday 07:00 UTC (08:00 CET / 09:00 CEST)
   workflow_dispatch:
 
-
 permissions:
   contents: write
   pull-requests: write
   issues: write
 
 jobs:
-  pr-checklist:
-    uses: GetStream/android-ci-actions/.github/workflows/pr-clean-stale.yaml@main
+  pr-clean-stale:
+    uses: GetStream/stream-build-conventions-android/.github/workflows/pr-clean-stale.yaml@v0.6.0
     secrets: inherit
diff --git a/.github/workflows/pr-quality.yml b/.github/workflows/pr-quality.yml
index be9c0542f1..723d85736d 100644
--- a/.github/workflows/pr-quality.yml
+++ b/.github/workflows/pr-quality.yml
@@ -1,16 +1,19 @@
-# .github/workflows/pr-quality-check.yml (caller)
 name: PR checklist
 
 on:
   pull_request:
-    types: [opened, edited, synchronize, labeled, unlabeled, reopened]
+    types: [ opened, edited, synchronize, labeled, unlabeled, reopened ]
 
 permissions:
   contents: read
   pull-requests: write
   issues: write
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   pr-checklist:
-    uses: GetStream/android-ci-actions/.github/workflows/pr-quality.yml@main
+    uses: GetStream/stream-build-conventions-android/.github/workflows/pr-quality.yml@v0.6.0
     secrets: inherit