diff --git a/.github/workflows/add-good-first-issue-labels.yml b/.github/workflows/add-good-first-issue-labels.yml
index b9cdd0674..00acdb847 100644
--- a/.github/workflows/add-good-first-issue-labels.yml
+++ b/.github/workflows/add-good-first-issue-labels.yml
@@ -1,7 +1,7 @@
-#This workflow is centrally managed in https://github.com/asyncapi/.github/
-#Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
+# This workflow is centrally managed in https://github.com/asyncapi/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
 
-#Purpose of this workflow is to enable anyone to label issue with 'Good First Issue' and 'area/*' with a single command.
+# Purpose of this workflow is to enable anyone to label issue with 'Good First Issue' and 'area/*' with a single command.
 name: Add 'Good First Issue' and 'area/*' labels # if proper comment added
 
 on: 
diff --git a/.github/workflows/automerge-for-humans-add-ready-to-merge-or-do-not-merge-label.yml b/.github/workflows/automerge-for-humans-add-ready-to-merge-or-do-not-merge-label.yml
index 68f396031..d35c32156 100644
--- a/.github/workflows/automerge-for-humans-add-ready-to-merge-or-do-not-merge-label.yml
+++ b/.github/workflows/automerge-for-humans-add-ready-to-merge-or-do-not-merge-label.yml
@@ -1,8 +1,11 @@
-#This workflow is centrally managed in https://github.com/asyncapi/.github/
-#Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
+# This workflow is centrally managed in https://github.com/asyncapi/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
 
-#Purpose of this workflow is to enable anyone to label PR with `ready-to-merge` and `do-not-merge` labels to get stuff merged or blocked from merging
-name: Add ready-to-merge or do-not-merge label # if proper comment added
+# Purpose of this workflow is to enable anyone to label PR with the following labels:
+# `ready-to-merge` and `do-not-merge` labels to get stuff merged or blocked from merging
+# `autoupdate` to keep a branch up-to-date with the target branch
+
+name: Label PRs # if proper comment added
 
 on: 
     issue_comment:
@@ -10,21 +13,52 @@ on:
             - created
 
 jobs:
-  parse-comment-and-add-ready: # for handling cases when you want to mark as ready to merge
-    if: github.event.issue.pull_request && github.event.issue.state != 'closed' && github.actor != 'asyncapi-bot'
+  add-ready-to-merge-label:
+    if: > 
+      github.event.issue.pull_request && 
+      github.event.issue.state != 'closed' && 
+      github.actor != 'asyncapi-bot' && 
+      (
+        contains(github.event.comment.body, '/ready-to-merge') || 
+        contains(github.event.comment.body, '/rtm' )
+      )
+
     runs-on: ubuntu-latest
     steps:
-      - name: Check if PR is draft # such info is not available in the context of issue_comment event
+
+      - name: Check if PR is draft or is up-to-date # such info is not available in the context of issue_comment event
         uses: actions/github-script@v5
-        id: checkDraft
+        id: checkPR
         with:
           result-encoding: string
           script: |
+            let isDraft = false;
+            let isUpToDate = true;
             const prDetailsUrl = context.payload.issue.pull_request.url;
-            const response = await github.request(prDetailsUrl);
-            return response.data.draft;
-      - name: Add label
-        if: steps.checkDraft.outputs.result == 'false' && (contains(github.event.comment.body, '/ready-to-merge') || contains(github.event.comment.body, '/rtm' ))
+            const { data: pull } = await github.request(prDetailsUrl);
+            isDraft = pull.draft;
+
+            const { data: comparison } =
+            await github.rest.repos.compareCommitsWithBasehead({
+              owner: pull.head.repo.owner.login,
+              repo: pull.head.repo.name,
+              basehead: `${pull.head.label}...${pull.base.label}`,
+            });
+            if (comparison.behind_by !== 0) isUpToDate = false;
+            return { isDraft, isUpToDate };
+            
+      - uses: actions-ecosystem/action-create-comment@v1
+        if: ${{ !steps.checkPR.outputs.result.isUpToDate }}
+        with:
+          github_token: ${{ secrets.GH_TOKEN }}
+          body: |
+            Hello, @${{ github.actor }}! 👋🏼
+            This PR is not up to date with the base branch and can't be merged.
+            You can add comment to this PR with text: `/autoupdate` or `/au`. This way you ask our bot to perform regular updates for you. The only requirement for this to work is to enable [Allow edits from maintainers](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork) option in your PR. Otherwise the only option that you have is to manually update your branch with latest version of the base branch.
+            Thanks 😄 
+
+      - name: Add ready-to-merge label
+        if: ${{ !steps.checkPR.outputs.result.isDraft }}
         uses: actions/github-script@v5
         with:
           github-token: ${{ secrets.GH_TOKEN }}
@@ -36,12 +70,18 @@ jobs:
               labels: ['ready-to-merge']
             }) 
 
-  parse-comment-and-add-block: # for handling cases when you want to mark as do-not-merge
-    if: github.event.issue.pull_request && github.event.issue.state != 'closed' && github.actor != 'asyncapi-bot'
+  add-do-not-merge-label:
+    if: >
+      github.event.issue.pull_request &&
+      github.event.issue.state != 'closed' &&
+      github.actor != 'asyncapi-bot' &&
+      (
+        contains(github.event.comment.body, '/do-not-merge') ||
+        contains(github.event.comment.body, '/dnm' )
+      )
     runs-on: ubuntu-latest
     steps:
-      - name: Add label
-        if: contains(github.event.comment.body, '/do-not-merge') || contains(github.event.comment.body, '/dnm' )
+      - name: Add do-not-merge label
         uses: actions/github-script@v5
         with:
           github-token: ${{ secrets.GH_TOKEN }}
@@ -51,4 +91,26 @@ jobs:
               owner: context.repo.owner,
               repo: context.repo.repo,
               labels: ['do-not-merge']
+            }) 
+  add-autoupdate-label:
+    if: >
+      github.event.issue.pull_request && 
+      github.event.issue.state != 'closed' && 
+      github.actor != 'asyncapi-bot' &&
+      (
+        contains(github.event.comment.body, '/autoupdate') ||
+        contains(github.event.comment.body, '/au' )
+      )
+    runs-on: ubuntu-latest
+    steps:
+      - name: Add autoupdate label
+        uses: actions/github-script@v5
+        with:
+          github-token: ${{ secrets.GH_TOKEN }}
+          script: |
+            github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ['autoupdate']
             }) 
\ No newline at end of file
diff --git a/.github/workflows/automerge-for-humans-merging.yml b/.github/workflows/automerge-for-humans-merging.yml
index 37ee722fd..e1b4deb40 100644
--- a/.github/workflows/automerge-for-humans-merging.yml
+++ b/.github/workflows/automerge-for-humans-merging.yml
@@ -1,7 +1,7 @@
-#This workflow is centrally managed in https://github.com/asyncapi/.github/
-#Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
+# This workflow is centrally managed in https://github.com/asyncapi/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
 
-#Purpose of this workflow is to allow people to merge PR without a need of maintainer doing it. If all checks are in place (including maintainers approval) - JUST MERGE IT!
+# Purpose of this workflow is to allow people to merge PR without a need of maintainer doing it. If all checks are in place (including maintainers approval) - JUST MERGE IT!
 name: Automerge For Humans
 
 on:
diff --git a/.github/workflows/automerge-for-humans-remove-ready-to-merge-label-on-edit.yml b/.github/workflows/automerge-for-humans-remove-ready-to-merge-label-on-edit.yml
index 3fe915797..f38296c8d 100644
--- a/.github/workflows/automerge-for-humans-remove-ready-to-merge-label-on-edit.yml
+++ b/.github/workflows/automerge-for-humans-remove-ready-to-merge-label-on-edit.yml
@@ -1,5 +1,5 @@
-#This workflow is centrally managed in https://github.com/asyncapi/.github/
-#Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
+# This workflow is centrally managed in https://github.com/asyncapi/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
 
 # Defence from evil contributor that after adding `ready-to-merge` all suddenly makes evil commit or evil change in PR title
 # Label is removed once above action is detected
diff --git a/.github/workflows/automerge-orphans.yml b/.github/workflows/automerge-orphans.yml
index 8b8c6c2dc..5c39ba921 100644
--- a/.github/workflows/automerge-orphans.yml
+++ b/.github/workflows/automerge-orphans.yml
@@ -1,5 +1,5 @@
-#This action is centrally managed in https://github.com/asyncapi/.github/
-#Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
+# This action is centrally managed in https://github.com/asyncapi/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
 
 name: 'Notify on failing automerge'
 
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
index 016cf872d..052a19c32 100644
--- a/.github/workflows/automerge.yml
+++ b/.github/workflows/automerge.yml
@@ -32,7 +32,7 @@ jobs:
               issue_number: context.issue.number,
               owner: context.repo.owner,
               repo: context.repo.repo,
-              labels: ['autoapproved']
+              labels: ['autoapproved', 'autoupdate']
             })
 
   automerge-for-bot:
diff --git a/.github/workflows/autoupdate.yml b/.github/workflows/autoupdate.yml
index bdac9a3a3..a483127e6 100644
--- a/.github/workflows/autoupdate.yml
+++ b/.github/workflows/autoupdate.yml
@@ -1,12 +1,12 @@
-#This action is centrally managed in https://github.com/asyncapi/.github/
-#Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
+# This action is centrally managed in https://github.com/asyncapi/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
 
-#This workflow is designed to work with:
+# This workflow is designed to work with:
 # - autoapprove and automerge workflows for dependabot and asyncapibot.
 # - special release branches that we from time to time create in upstream repos. If we open up PRs for them from the very beginning of the release, the release branch will constantly update with new things from the destination branch they are opened against
 
 # It uses GitHub Action that auto-updates pull requests branches, whenever changes are pushed to their destination branch.
-#Autoupdating to latest destination branch works only in the context of upstream repo and not forks
+# Autoupdating to latest destination branch works only in the context of upstream repo and not forks
 
 name: autoupdate
 
@@ -17,9 +17,13 @@ on:
       - 'dependabot/**'
       - 'bot/**'
       - 'all-contributors/**'
+  pull_request:
+    types:
+      - labeled
 
 jobs:
   autoupdate-for-bot:
+    if: ${{ !github.event.issue.pull_request || contains(github.event.pull_request.labels.*.name, 'autoupdate') }}
     name: Autoupdate autoapproved PR created in the upstream
     runs-on: ubuntu-latest
     steps:
@@ -28,6 +32,6 @@ jobs:
         env:
           GITHUB_TOKEN: '${{ secrets.GH_TOKEN }}'
           PR_FILTER: "labelled"
-          PR_LABELS: "autoapproved"
+          PR_LABELS: "autoupdate"
           PR_READY_STATE: "ready_for_review"
           MERGE_CONFLICT_ACTION: "ignore"
diff --git a/.github/workflows/bump.yml b/.github/workflows/bump.yml
index cf4c6a841..68daa7c0c 100644
--- a/.github/workflows/bump.yml
+++ b/.github/workflows/bump.yml
@@ -1,14 +1,14 @@
-#This action is centrally managed in https://github.com/asyncapi/.github/
-#Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
+# This action is centrally managed in https://github.com/asyncapi/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
 
-#Purpose of this action is to update npm package in libraries that use it. It is like dependabot for asyncapi npm modules only. 
-#It runs in a repo after merge of release commit and searches for other packages that use released package. Every found package gets updated with lates version
+# Purpose of this action is to update npm package in libraries that use it. It is like dependabot for asyncapi npm modules only. 
+# It runs in a repo after merge of release commit and searches for other packages that use released package. Every found package gets updated with lates version
 
 name: Bump package version in dependent repos - if Node project
 
 on:
-  #It cannot run on release event as when release is created then version is not yet bumped in package.json
-  #This means we cannot extract easily latest version and have a risk that package is not yet on npm
+  # It cannot run on release event as when release is created then version is not yet bumped in package.json
+  # This means we cannot extract easily latest version and have a risk that package is not yet on npm
   push:
     branches:
       - master
@@ -31,4 +31,4 @@ jobs:
           github_token: ${{ secrets.GH_TOKEN }}
           committer_username: asyncapi-bot
           committer_email: info@asyncapi.io
-          repos_to_ignore: html-template #this is temporary until react component releases 1.0, then it can be removed
+          repos_to_ignore: html-template # this is temporary until react component releases 1.0, then it can be removed
diff --git a/.github/workflows/help-command.yml b/.github/workflows/help-command.yml
index f9d477351..16f378cbc 100644
--- a/.github/workflows/help-command.yml
+++ b/.github/workflows/help-command.yml
@@ -1,5 +1,5 @@
-#This workflow is centrally managed in https://github.com/asyncapi/.github/
-#Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
+# This workflow is centrally managed in https://github.com/asyncapi/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
 
 name: Create help comment
 
@@ -25,6 +25,7 @@ jobs:
 
             - `/ready-to-merge` or `/rtm` - This comment will trigger automerge of PR in case all required checks are green, approvals in place and do-not-merge label is not added
             - `/do-not-merge` or `/dnm` - This comment will block automerging even if all conditions are met and ready-to-merge label is added
+            - `/autoupdate` or `/au` - This comment will add `autoupdate` label to the PR and keeps your PR up-to-date to the target branch. Unless there is a merge conflict.
   create_help_comment_issue:
     if: ${{ !github.event.issue.pull_request && contains(github.event.comment.body, '/help') && github.actor != 'asyncapi-bot' }}
     runs-on: ubuntu-latest
diff --git a/.github/workflows/if-go-pr-testing.yml b/.github/workflows/if-go-pr-testing.yml
index b91e95784..606e689b3 100644
--- a/.github/workflows/if-go-pr-testing.yml
+++ b/.github/workflows/if-go-pr-testing.yml
@@ -1,6 +1,7 @@
-#This action is centrally managed in https://github.com/asyncapi/.github/
-#Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
-#It does magic only if there is go.mod file in the root of the project
+# This action is centrally managed in https://github.com/asyncapi/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
+
+# It does magic only if there is go.mod file in the root of the project
 name: PR testing - if Go project
 
 on:
diff --git a/.github/workflows/if-nodejs-pr-testing.yml b/.github/workflows/if-nodejs-pr-testing.yml
index 1894ed846..1dcccd320 100644
--- a/.github/workflows/if-nodejs-pr-testing.yml
+++ b/.github/workflows/if-nodejs-pr-testing.yml
@@ -1,6 +1,7 @@
-#This action is centrally managed in https://github.com/asyncapi/.github/
-#Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
-#It does magic only if there is package.json file in the root of the project
+# This action is centrally managed in https://github.com/asyncapi/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
+
+# It does magic only if there is package.json file in the root of the project
 name: PR testing - if Node project
 
 on:
diff --git a/.github/workflows/if-nodejs-release.yml b/.github/workflows/if-nodejs-release.yml
index 75bd5de48..bc5b53766 100644
--- a/.github/workflows/if-nodejs-release.yml
+++ b/.github/workflows/if-nodejs-release.yml
@@ -1,6 +1,7 @@
-#This action is centrally managed in https://github.com/asyncapi/.github/
-#Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
-#It does magic only if there is package.json file in the root of the project
+# This action is centrally managed in https://github.com/asyncapi/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
+
+# It does magic only if there is package.json file in the root of the project
 name: Release - if Node project
 
 on:
diff --git a/.github/workflows/if-nodejs-version-bump.yml b/.github/workflows/if-nodejs-version-bump.yml
index 4de5a7a07..721caa9d7 100644
--- a/.github/workflows/if-nodejs-version-bump.yml
+++ b/.github/workflows/if-nodejs-version-bump.yml
@@ -1,6 +1,7 @@
-#This action is centrally managed in https://github.com/asyncapi/.github/
-#Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
-#It does magic only if there is package.json file in the root of the project
+# This action is centrally managed in https://github.com/asyncapi/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
+
+# It does magic only if there is package.json file in the root of the project
 name: Version bump - if Node.js project
 
 on: 
diff --git a/.github/workflows/issues-prs-notifications.yml b/.github/workflows/issues-prs-notifications.yml
index 948abb87c..576b2bac8 100644
--- a/.github/workflows/issues-prs-notifications.yml
+++ b/.github/workflows/issues-prs-notifications.yml
@@ -1,7 +1,7 @@
-#This action is centrally managed in https://github.com/asyncapi/.github/
-#Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
+# This action is centrally managed in https://github.com/asyncapi/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
 
-#This action notifies community on slack whenever there is a new issue, PR or discussion started in given repository
+# This action notifies community on slack whenever there is a new issue, PR or discussion started in given repository
 name: Notify slack
 
 on:
diff --git a/.github/workflows/link-check-cron.yml b/.github/workflows/link-check-cron.yml
index f7fabcd53..2b7038aeb 100644
--- a/.github/workflows/link-check-cron.yml
+++ b/.github/workflows/link-check-cron.yml
@@ -1,3 +1,6 @@
+# This workflow is centrally managed in https://github.com/asyncapi/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
+
 name: Check Markdown links (Weekly)
 
 on:
diff --git a/.github/workflows/link-check-pr.yml b/.github/workflows/link-check-pr.yml
index f678ed191..2d7fec315 100644
--- a/.github/workflows/link-check-pr.yml
+++ b/.github/workflows/link-check-pr.yml
@@ -1,3 +1,6 @@
+# This workflow is centrally managed in https://github.com/asyncapi/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
+
 name: Check Markdown links
 
 on: 
diff --git a/.github/workflows/lint-pr-title.yml b/.github/workflows/lint-pr-title.yml
index 1d6cbf61d..87e2fa5e7 100644
--- a/.github/workflows/lint-pr-title.yml
+++ b/.github/workflows/lint-pr-title.yml
@@ -1,5 +1,5 @@
-#This action is centrally managed in https://github.com/asyncapi/.github/
-#Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
+# This action is centrally managed in https://github.com/asyncapi/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
 
 name: Lint PR title
 
diff --git a/.github/workflows/notify-tsc-members-mention.yml b/.github/workflows/notify-tsc-members-mention.yml
index 14db9eefa..e33b26251 100644
--- a/.github/workflows/notify-tsc-members-mention.yml
+++ b/.github/workflows/notify-tsc-members-mention.yml
@@ -1,7 +1,7 @@
-#This action is centrally managed in https://github.com/asyncapi/.github/
-#Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
+# This action is centrally managed in https://github.com/asyncapi/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
 
-#This action notifies community on slack whenever there is a new issue, PR or discussion started in given repository
+# This action notifies community on slack whenever there is a new issue, PR or discussion started in given repository
 name: Notify slack whenever TSC members are mentioned in GitHub
 
 on:
diff --git a/.github/workflows/release-announcements.yml b/.github/workflows/release-announcements.yml
index 5a0b29f24..b2f3ba76d 100644
--- a/.github/workflows/release-announcements.yml
+++ b/.github/workflows/release-announcements.yml
@@ -1,5 +1,6 @@
-#This action is centrally managed in https://github.com/asyncapi/.github/
-#Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
+# This action is centrally managed in https://github.com/asyncapi/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
+
 name: 'Announce releases in different channels'
 
 on: 
diff --git a/.github/workflows/sentiment-analysis.yml b/.github/workflows/sentiment-analysis.yml
index 73b8b490b..cd8ab05f7 100644
--- a/.github/workflows/sentiment-analysis.yml
+++ b/.github/workflows/sentiment-analysis.yml
@@ -1,5 +1,5 @@
-#This action is centrally managed in https://github.com/asyncapi/.github/
-#Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
+# This action is centrally managed in https://github.com/asyncapi/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
 
 name: 'Sentiment Analysis'
 
diff --git a/.github/workflows/stale-issues-prs.yml b/.github/workflows/stale-issues-prs.yml
index 06d7d9e92..766731834 100644
--- a/.github/workflows/stale-issues-prs.yml
+++ b/.github/workflows/stale-issues-prs.yml
@@ -1,5 +1,5 @@
-#This action is centrally managed in https://github.com/asyncapi/.github/
-#Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
+# This action is centrally managed in https://github.com/asyncapi/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
 
 name: Manage stale issues and PRs
 
diff --git a/.github/workflows/welcome-first-time-contrib.yml b/.github/workflows/welcome-first-time-contrib.yml
index 0aabef99b..e72fecef8 100644
--- a/.github/workflows/welcome-first-time-contrib.yml
+++ b/.github/workflows/welcome-first-time-contrib.yml
@@ -1,5 +1,5 @@
-#This action is centrally managed in https://github.com/asyncapi/.github/
-#Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
+# This action is centrally managed in https://github.com/asyncapi/.github/
+# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo
 
 name: Welcome first time contributors