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 66606fc17aa..02d71a7969e 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
@@ -59,7 +59,9 @@ jobs:
                 body: `Hello, @${{ github.actor }}! 👋🏼
                        This PR is not up to date with the base branch and can't be merged.
                        Please update your branch manually with the latest version of the base branch.
-                       PRO-TIP: Add a comment to your PR with the text: \`/au\` or \`/autoupdate\` and our bot will take care of updating the branch in the future. 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.
+                       PRO-TIP: To request an update from the upstream branch, simply comment \`/u\` or \`/update\` and our bot will handle the update operation promptly.
+                       
+                       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. Also the update will not work if your fork is located in an organization, not under your personal profile.
                        Thanks 😄`
               })
             }
diff --git a/.github/workflows/bump.yml b/.github/workflows/bump.yml
index 1e17ccf2d37..43ba75fd5d6 100644
--- a/.github/workflows/bump.yml
+++ b/.github/workflows/bump.yml
@@ -31,5 +31,5 @@ jobs:
           github_token: ${{ secrets.GH_TOKEN }}
           committer_username: asyncapi-bot
           committer_email: info@asyncapi.io
-          repos_to_ignore: spec,bindings,saunter
+          repos_to_ignore: spec,bindings,saunter,server-api
           custom_id: "dependency update from asyncapi bot"
diff --git a/.github/workflows/help-command.yml b/.github/workflows/help-command.yml
index 55353bb89e2..3f4dcbc4cdb 100644
--- a/.github/workflows/help-command.yml
+++ b/.github/workflows/help-command.yml
@@ -34,7 +34,8 @@ jobs:
                     - \`/please-take-a-look\` or \`/ptal\` - This comment will add a comment to the PR asking for attention from the reviewrs who have not reviewed the PR yet.
                     - \`/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's future changes. Unless there is a merge conflict or it is a draft PR.`
+                    - \`/autoupdate\` or \`/au\` - This comment will add \`autoupdate\` label to the PR and keeps your PR up-to-date to the target branch's future changes. Unless there is a merge conflict or it is a draft PR. (Currently only works for upstream branches.)
+                    - \`/update\` or \`/u\` - This comment will update the PR with the latest changes from the target branch. Unless there is a merge conflict or it is a draft PR. NOTE: this only updates the PR once, so if you need to update again, you need to call the command again.`
             })
 
   create_help_comment_issue:
diff --git a/.github/workflows/update-pr.yml b/.github/workflows/update-pr.yml
new file mode 100644
index 00000000000..2fa19b0ade6
--- /dev/null
+++ b/.github/workflows/update-pr.yml
@@ -0,0 +1,102 @@
+# 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 will run on every comment with /update or /u. And will create merge-commits for the PR.
+# This also works with forks, not only with branches in the same repository/organization.
+# Currently, does not work with forks in different organizations.
+
+# This workflow will be distributed to all repositories in the AsyncAPI organization
+
+name: Update PR branches from fork
+
+on:
+  issue_comment: 
+    types: [created]
+
+jobs:
+  update-pr:
+    if: >
+      startsWith(github.repository, 'asyncapi/') &&
+      github.event.issue.pull_request && 
+      github.event.issue.state != 'closed' && (
+        contains(github.event.comment.body, '/update') ||
+        contains(github.event.comment.body, '/u')
+      )
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get Pull Request Details
+        id: pr
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GH_TOKEN || secrets.GITHUB_TOKEN }}
+          previews: 'merge-info-preview' # https://docs.github.com/en/graphql/overview/schema-previews#merge-info-preview-more-detailed-information-about-a-pull-requests-merge-state-preview
+          script: |
+            const prNumber = context.payload.issue.number;
+            core.debug(`PR Number: ${prNumber}`);
+            const { data: pr } = await github.rest.pulls.get({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: prNumber
+            });
+
+            // If the PR has conflicts, we don't want to update it
+            const updateable = ['behind', 'blocked', 'unknown', 'draft', 'clean'].includes(pr.mergeable_state);
+            console.log(`PR #${prNumber} is ${pr.mergeable_state} and is ${updateable ? 'updateable' : 'not updateable'}`);
+            core.setOutput('updateable', updateable);
+
+            core.debug(`Updating PR #${prNumber} with head ${pr.head.sha}`);
+
+            return {
+              id: pr.node_id,
+              number: prNumber,
+              head: pr.head.sha,
+            }
+      - name: Update the Pull Request
+        if: steps.pr.outputs.updateable == 'true'
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GH_TOKEN || secrets.GITHUB_TOKEN }}
+          script: |
+            const mutation = `mutation update($input: UpdatePullRequestBranchInput!) {
+              updatePullRequestBranch(input: $input) {
+                pullRequest {
+                  mergeable
+                }
+              }
+            }`;
+
+            const pr_details = ${{ steps.pr.outputs.result }};
+
+            try {
+              const { data } = await github.graphql(mutation, {
+                input: {
+                  pullRequestId: pr_details.id,
+                  expectedHeadOid: pr_details.head,
+                }
+              });
+            } catch (GraphQLError) {
+              core.debug(GraphQLError);
+              if (
+                GraphQLError.name === 'GraphqlResponseError' &&
+                GraphQLError.errors.some(
+                  error => error.type === 'FORBIDDEN' || error.type === 'UNAUTHORIZED'
+                )
+              ) {
+                // Add comment to PR if the bot doesn't have permissions to update the PR
+                const comment = `Hi @${context.actor}. Update of PR has failed. It can be due to one of the following reasons:
+                -  I don't have permissions to update this PR. To update your fork with upstream using bot you need 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 the PR. 
+                -  The fork is located in an organization, not under your personal profile. No solution for that. You are on your own with manual update.
+                -  There may be a conflict in the PR. Please resolve the conflict and try again.`;
+
+                await github.rest.issues.createComment({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  issue_number: context.issue.number,
+                  body: comment
+                });
+
+                core.setFailed('Bot does not have permissions to update the PR');
+              } else {
+                core.setFailed(GraphQLError.message);
+              }
+            }