diff --git a/.github/actions/reportportal-summarize/action.yml b/.github/actions/reportportal-summarize/action.yml
index 10f8360ac..54d2fc437 100644
--- a/.github/actions/reportportal-summarize/action.yml
+++ b/.github/actions/reportportal-summarize/action.yml
@@ -23,6 +23,9 @@ outputs:
   slack-message:
     description: Outcome message for slack
     value: ${{ steps.slack-message.outputs.message }}
+  teams-message:
+    description: Outcome message for teams
+    value: ${{ steps.teams-message.outputs.message }}
 
 runs:
   using: composite
@@ -54,3 +57,12 @@ runs:
         RP_CONTENT: ${{ steps.rp-output.outputs.content }}
         RP_LAUNCH_URL: ${{ steps.rp-output.outputs.url }}
       run: ${{ github.action_path }}/get-slack-message.sh
+
+    - name: Compute Teams message
+      id: teams-message
+      shell: bash
+      env:
+        RP_LAUNCH_KEY: ${{ inputs.rp-launch-key }}
+        RP_CONTENT: ${{ steps.rp-output.outputs.content }}
+        RP_LAUNCH_URL: ${{ steps.rp-output.outputs.url }}
+      run: ${{ github.action_path }}/get-teams-message.sh
diff --git a/.github/actions/reportportal-summarize/get-slack-message.sh b/.github/actions/reportportal-summarize/get-slack-message.sh
index 02df8bbed..1a4a68463 100755
--- a/.github/actions/reportportal-summarize/get-slack-message.sh
+++ b/.github/actions/reportportal-summarize/get-slack-message.sh
@@ -18,15 +18,15 @@ if [[ -n "$RP_LAUNCH_KEY" ]]; then
       read -r status
       case $status in
         PASSED)
-        sstatus="✅" ;;
+        status_icon="✅" ;;
         FAILED)
-        sstatus="❌"
+        status_icon="❌"
         ;;
         *)
-        sstatus="$status"
+        status_icon="$status"
         ;;
       esac
-      MSG+="\n<$RP_LAUNCH_URL/$id|Report #$number> $sstatus"
+      MSG+="\n<$RP_LAUNCH_URL/$id|Report #$number> $status_icon"
     done < <(echo "$RP_CONTENT" | jq -r '.content[] | .id, .number, .status')
   fi
 fi
diff --git a/.github/actions/reportportal-summarize/get-teams-message.sh b/.github/actions/reportportal-summarize/get-teams-message.sh
new file mode 100755
index 000000000..d043070c8
--- /dev/null
+++ b/.github/actions/reportportal-summarize/get-teams-message.sh
@@ -0,0 +1,34 @@
+#!/bin/bash -e
+
+if [[ -n "$RP_LAUNCH_KEY" ]]; then
+
+  NB=$(echo "$RP_CONTENT" | jq -r '.page.totalElements // "0"')
+  if [[ "$NB" == "0" || -z "$NB" ]]; then
+    MSG+="No report found for key "'`'"$RP_LAUNCH_KEY"'`'"."
+    MSG+="\n\nSee [latest reports]($RP_LAUNCH_URL)."
+  elif [ "$NB" == "1" ]; then
+    RP_LAUNCH_ID=$(echo "$RP_CONTENT" | jq -r '.content[0].id // empty')
+    STATUS=$(echo "$RP_CONTENT" | jq -r '.content[0].status // empty')
+    [[ "$STATUS" == 'PASSED' ]] && ICON="✅" || ICON="❌"
+    MSG+="See [report]($RP_LAUNCH_URL/$RP_LAUNCH_ID) $ICON"
+  else
+    MSG+="$NB reports found for key "'`'"$RP_LAUNCH_KEY"'`'"."
+    while read -r id ; do
+      read -r number
+      read -r status
+      case $status in
+        PASSED)
+        status_icon="✅" ;;
+        FAILED)
+        status_icon="❌"
+        ;;
+        *)
+        status_icon="$status"
+        ;;
+      esac
+      MSG+="\n\n[Report #$number]($RP_LAUNCH_URL/$id) $status_icon"
+    done < <(echo "$RP_CONTENT" | jq -r '.content[] | .id, .number, .status')
+  fi
+fi
+
+echo "message=$MSG" >> $GITHUB_OUTPUT
diff --git a/.github/actions/reportportal-summarize/tests/get-teams-message.bats b/.github/actions/reportportal-summarize/tests/get-teams-message.bats
new file mode 100644
index 000000000..8c4dd8eeb
--- /dev/null
+++ b/.github/actions/reportportal-summarize/tests/get-teams-message.bats
@@ -0,0 +1,92 @@
+setup() {
+    # Runs everywhere
+    DIR="$( cd "$( dirname "$BATS_TEST_FILENAME" )" >/dev/null 2>&1 && pwd )"
+    PATH="$DIR/..:$PATH"
+
+    export GITHUB_OUTPUT="$BATS_TMPDIR"/test-get-teams-message_ghoutput_"$RANDOM"'.log'
+    > $GITHUB_OUTPUT
+
+    export RP_LAUNCH_KEY=my-tests-push-3665876492
+    export RP_TOKEN=tok
+    export RP_URL=https://rpserver:8080
+
+    export RP_CONTENT=""
+    export RP_LAUNCH_URL=https://rpserver:8080/ui/#my-project/launches/all
+
+    export NO_MESSAGE="message="
+    export KEY_NO_REPORT="message=No report found for key \`my-tests-push-3665876492\`.\n\nSee [latest reports](https://rpserver:8080/ui/#my-project/launches/all)."
+    export SINGLE_REPORT="message=See [report](https://rpserver:8080/ui/#my-project/launches/all/88) ✅"
+    export MULTIPLE_REPORTS=$(cat << BATS
+message=3 reports found for key \`my-tests-push-3665876492\`.\n\n[Report #3](https://rpserver:8080/ui/#my-project/launches/all/91) ❌\n\n[Report #2](https://rpserver:8080/ui/#my-project/launches/all/90) WHATEVER_STATUS\n\n[Report #1](https://rpserver:8080/ui/#my-project/launches/all/89) ✅
+BATS
+)
+}
+
+teardown() {
+    rm -f $GITHUB_OUTPUT
+}
+
+@test "teams message rp disabled" {
+    export RP_LAUNCH_KEY=""
+    run get-teams-message.sh
+    [ "$status" -eq 0 ]
+    echo "$(< $GITHUB_OUTPUT)"
+    [ "$(< $GITHUB_OUTPUT)" = "$NO_MESSAGE" ]
+}
+
+@test "teams message no launch id" {
+    run get-teams-message.sh
+    [ "$status" -eq 0 ]
+    echo "$(< $GITHUB_OUTPUT)"
+    [ "$(< $GITHUB_OUTPUT)" = "$KEY_NO_REPORT" ]
+}
+
+@test "teams message single" {
+    export RP_CONTENT="$(< $BATS_TEST_DIRNAME/sample-launch.json)"
+    run get-teams-message.sh
+    [ "$status" -eq 0 ]
+    echo "$(< $GITHUB_OUTPUT)"
+    [ "$(< $GITHUB_OUTPUT)" = "$SINGLE_REPORT" ]
+}
+
+@test "teams message multiple" {
+    export RP_CONTENT="$(< $BATS_TEST_DIRNAME/sample-launches.json)"
+    run get-teams-message.sh
+    [ "$status" -eq 0 ]
+    echo "$(< $GITHUB_OUTPUT)"
+    [ "$(< $GITHUB_OUTPUT)" = "$MULTIPLE_REPORTS" ]
+}
+
+@test "teams message rp failure no results" {
+    run get-teams-message.sh
+    [ "$status" -eq 0 ]
+    echo "$(< $GITHUB_OUTPUT)"
+    [ "$(< $GITHUB_OUTPUT)" = "$KEY_NO_REPORT" ]
+}
+
+@test "teams message rp failure no results empty json" {
+    export RP_CONTENT="{}"
+    run get-teams-message.sh
+    [ "$status" -eq 0 ]
+    echo "$(< $GITHUB_OUTPUT)"
+    [ "$(< $GITHUB_OUTPUT)" = "$KEY_NO_REPORT" ]
+}
+
+@test "teams message rp success no results" {
+    export OUTCOME="success"
+    export RP_CONTENT="$(< $BATS_TEST_DIRNAME/empty-launch.json)"
+    run get-teams-message.sh
+    [ "$status" -eq 0 ]
+    echo "$(< $GITHUB_OUTPUT)"
+    [ "$(< $GITHUB_OUTPUT)" = "$KEY_NO_REPORT" ]
+}
+
+@test "teams message rp failure no results empty json no launch key" {
+    export RP_LAUNCH_KEY=""
+    export RP_CONTENT="{}"
+    run get-teams-message.sh
+    [ "$status" -eq 0 ]
+    echo "$(< $GITHUB_OUTPUT)"
+    [ "$(< $GITHUB_OUTPUT)" = "$NO_MESSAGE" ]
+
+}
diff --git a/.github/actions/send-teams-notification/action.yml b/.github/actions/send-teams-notification/action.yml
index f83cda119..12530cf79 100644
--- a/.github/actions/send-teams-notification/action.yml
+++ b/.github/actions/send-teams-notification/action.yml
@@ -4,70 +4,261 @@ inputs:
   webhook-url:
     description: Microsoft Teams Incoming Webhooks URL
     required: true
+  title:
+    description: 'Text to show as message title'
+    required: false
+  message:
+    description: An optional message that overrides the default one
+    required: false
+  append:
+    description: Whether the optional message should be added after the default one
+    required: false
+    default: "false"
   needs:
-    description: JSON parsed needs context
+    description: 'JSON parsed needs context'
     required: false
-    default: ""
+    default: '{}'
   dry-run:
     description: Do not actually send the message
     required: false
     default: 'false'
-  raw:
-    description: JSON object to send to Microsoft Teams
-    required: false
-    default: ""
-  overwrite:
-    description: JSON like object to overwrite default message
-    required: false
-    default: >-
-      {
-          title: `${{github.actor}} initialized ${{ github.event_name}} event on ${{ github.repository }} of branch ${{ github.ref_name}}`,
-          "potentialAction": [
-              {
-                "@type": "OpenUri",
-                "name": "Repository",
-                "targets": [
-                  {
-                    "os": "default",
-                    "uri": "${{ github.server_url }}/${{ github.repository }}"
-                  }
-                ]
-              },
-              {
-                "@type": "OpenUri",
-                "name": "Build URL",
-                "targets": [
-                  {
-                    "os": "default",
-                    "uri": "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-                  }
-                ]
-              },
-              {
-                "@type": "OpenUri",
-                "name": "Compare",
-                "targets": [
-                  {
-                    "os": "default",
-                    "uri": "${{ github.event.compare }}"
-                  }
-                ]
-              }
-            ]
-      }
+
 runs:
   using: composite
   steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-    - name: Check workflow status
+
+    - name: Compute workflow status
+      id: compute-workflow-status
       uses: martialonline/workflow-status@fe13c6a4716673e224038aa1b02387352fb35e13 # v4
-      id: workflow_status_check
+
+    - name: Compute color
+      shell: bash
+      id: compute-color
+      env:
+        STATUS: ${{ steps.compute-workflow-status.outputs.status }}
+      run: |
+        COLOR=808080
+        case $STATUS in
+          success)
+            COLOR=36A64F
+            ;;
+          failure)
+            COLOR=A30200
+            ;;
+        esac
+        echo "result=$COLOR" >> $GITHUB_OUTPUT
+
+    - name: Compute small sha
+      id: compute-small-sha
+      shell: bash
+      env:
+        GITHUB_LONG_SHA: ${{ github.sha }}
+      run: |
+        SMALL_SHA=${GITHUB_LONG_SHA:0:6}
+        echo "result=$SMALL_SHA" >> $GITHUB_OUTPUT
+
+    - name: Compute needs
+      id: compute-needs
+      shell: bash
+      env:
+        NEEDS: ${{ inputs.needs }}
+      run: |
+        NEEDS_OUTPUT=$(echo $NEEDS | jq -r 'to_entries[] | "\(.key): \(.value.result)"')
+        echo "result=$NEEDS_OUTPUT" >> $GITHUB_OUTPUT
+
+    - name: Compute message
+      id: compute-message
+      shell: bash
+      env:
+        EVENT_NAME: ${{ github.event_name }}
+        BLOCK_MESSAGE: ${{ inputs.message }}
+        APPEND: ${{ inputs.append }}
+        PR_TITLE: ${{ github.event.pull_request.title }}
+        ISSUE_BODY: ${{ github.event.issue.body }}
+        COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
+        NEEDS: ${{ steps.compute-needs.outputs.result }}
+      run: |
+        ${{ github.action_path }}/compute-message.sh >> $GITHUB_OUTPUT
+
+    - name: Compute event
+      id: compute-event
+      shell: bash
+      env:
+        EVENT_NAME: ${{ github.event_name }}
+        REPO_URL: ${{ github.server_url }}/${{ github.repository }}
+        PR_NUMBER: ${{ github.event.pull_request.number }}
+        SHA: ${{ github.sha }}
+      run: |
+        RESULT="$EVENT_NAME"
+        if [[ "$EVENT_NAME" == 'pull_request' ]]; then
+          RESULT="[$EVENT_NAME #$PR_NUMBER]($REPO_URL/pull/$PR_NUMBER)"
+        elif [[ "$EVENT_NAME" == 'push' ]]; then
+          RESULT="[$EVENT_NAME]($REPO_URL/commit/$SHA/checks)"
+        fi
+        echo "result=$RESULT" >> $GITHUB_OUTPUT
+
+    - name: Compute run link
+      id: compute-run-link
+      shell: bash
+      env:
+        REPO_URL: ${{ github.server_url }}/${{ github.repository }}
+        WORKFLOW: ${{ github.workflow }}
+      run: |
+        RESULT="$REPO_URL/actions/runs/$GITHUB_RUN_ID/attempts/$GITHUB_RUN_ATTEMPT"
+        echo "result=$RESULT" >> $GITHUB_OUTPUT
+
+    - name: Compute workflow title
+      id: compute-workflow-title
+      shell: bash
+      run: |
+        RESULT="$GITHUB_WORKFLOW"
+        if [[ "$GITHUB_RUN_ATTEMPT" != '1' ]]; then
+          RESULT+=" (attempt #$GITHUB_RUN_ATTEMPT)"
+        fi
+        echo "result=$RESULT" >> $GITHUB_OUTPUT
+
+    - name: Get branch name
+      uses: Alfresco/alfresco-build-tools/.github/actions/get-branch-name@v8.4.0
+
     - name: Send teams notification
-      uses: skitionek/notify-microsoft-teams@9c67757f64d610fb6748d8ff3c11f284355ed7ec # v1.0.8
+      uses: skitionek/notify-microsoft-teams@190d4d92146df11f854709774a4dae6eaf5e2aa3 # master
+      env:
+        ACTOR_URL: ${{ github.server_url }}/${{ github.triggering_actor }}
+        REPO_URL: ${{ github.server_url }}/${{ github.repository }}
+        SMALL_SHA: ${{ steps.compute-small-sha.outputs.result }}
+        MESSAGE_OUTPUT: ${{ steps.compute-message.outputs.result }}
+        RUN_LINK: ${{ steps.compute-run-link.outputs.result }}
+        WORKFLOW_TITLE: ${{ steps.compute-workflow-title.outputs.result }}
+        COLOR: ${{ steps.compute-color.outputs.result }}
+        TITLE: "Notification on ${{ steps.compute-event.outputs.result }} on branch [`${{ env.BRANCH_NAME }}`](${{ env.REPO_URL }}/tree/${{ env.BRANCH_NAME }})"
       with:
         webhook_url: ${{ inputs.webhook-url }}
-        job: ${{ toJSON(steps.workflow_status_check.outputs) }}
-        needs: ${{ inputs.needs }}
+        job: "{}"
+        steps: "{}"
+        needs: "{}"
         dry_run: ${{ inputs.dry-run }}
-        overwrite: ${{ inputs.overwrite }}
-        raw: ${{ inputs.raw }}
+        raw: >-
+          {
+            "type": "message",
+            "attachments": [
+              {
+                "contentType": "application/vnd.microsoft.card.adaptive",
+                "content": {
+                  "type": "AdaptiveCard",
+                  "body": [
+                    {
+                      "type": "TextBlock",
+                      "size": "medium",
+                      "weight": "bolder",
+                      "text": "${{ inputs.title || env.TITLE }}",
+                      "style": "heading",
+                      "wrap": true
+                    },
+                    {
+                      "type": "ColumnSet",
+                      "columns": [
+                        {
+                          "type": "Column",
+                          "items": [
+                            {
+                              "type": "Image",
+                              "style": "person",
+                              "url": "${{ env.ACTOR_URL }}.png?size=32",
+                              "altText": "${{ github.triggering_actor }}",
+                              "size": "small"
+                            }
+                          ],
+                          "width": "auto"
+                        },
+                        {
+                          "type": "Column",
+                          "items": [
+                            {
+                              "type": "TextBlock",
+                              "text": "[${{ github.triggering_actor }}](${{ env.ACTOR_URL }})"
+                            }
+                          ]
+                        },
+                        {
+                          "type": "Column",
+                          "items": [
+                            {
+                              "type": "Image",
+                              "style": "person",
+                              "url": "https://slack.github.com/static/img/favicon-neutral.png",
+                              "altText": "GitHub",
+                              "size": "small"
+                            }
+                          ],
+                          "width": "auto"
+                        },
+                        {
+                          "type": "Column",
+                          "items": [
+                            {
+                              "type": "TextBlock",
+                              "text": "[${{ github.repository }}](${{ env.REPO_URL }})"
+                            }
+                          ]
+                        }
+                      ]
+                    },
+                    {
+                      "type": "ColumnSet",
+                      "columns": [
+                        {
+                          "type": "Column",
+                          "items": [
+                            {
+                              "type": "TextBlock",
+                              "text": "**Action**: [${{ env.WORKFLOW_TITLE }}](${{ env.RUN_LINK }})"
+                            }
+                          ]
+                        },
+                        {
+                          "type": "Column",
+                          "items": [
+                            {
+                              "type": "TextBlock",
+                              "text": "**Commit**: [`${{ env.SMALL_SHA }}`](${{ env.REPO_URL }}/commit/${{ github.sha }})"
+                            }
+                          ]
+                        }
+                      ]
+                    },
+                    {
+                      "type": "ColumnSet",
+                      "columns": [
+                        {
+                          "type": "Column",
+                          "items": [
+                            {
+                              "type": "TextBlock",
+                              "text": "**Message**"
+                            },
+                            {
+                              "type": "TextBlock",
+                              "text": "${{ env.MESSAGE_OUTPUT }} "
+                            }
+                          ]
+                        }
+                      ]
+                    }
+                  ],
+                  "backgroundImage": {
+                    "url": "https://singlecolorimage.com/get/${{ env.COLOR }}/2x2",
+                    "fillMode": "RepeatHorizontally"
+                  },
+                  "$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
+                  "version": "1.5",
+                  "msteams": {
+                    "width": "full",
+                    "entities": [
+                      {}
+                    ]
+                  }
+                }
+              }
+            ]
+          }
diff --git a/.github/actions/send-teams-notification/compute-message.sh b/.github/actions/send-teams-notification/compute-message.sh
new file mode 100755
index 000000000..76daf8ff6
--- /dev/null
+++ b/.github/actions/send-teams-notification/compute-message.sh
@@ -0,0 +1,41 @@
+#!/bin/bash -e
+
+COMPUTED_MESSAGE=""
+
+if [ -n "$NEEDS" ]; then
+  COMPUTED_MESSAGE="$NEEDS\n\n"
+fi
+
+if [[ -n "$BLOCK_MESSAGE" && "$APPEND" == 'true' ]] || [ -z "$BLOCK_MESSAGE" ]; then
+  case $EVENT_NAME in
+    pull_request)
+    COMPUTED_MESSAGE="${COMPUTED_MESSAGE}$PR_TITLE"
+    ;;
+    issues)
+    COMPUTED_MESSAGE="${COMPUTED_MESSAGE}$ISSUE_BODY"
+    ;;
+    *)
+    COMPUTED_MESSAGE="${COMPUTED_MESSAGE}$COMMIT_MESSAGE"
+    ;;
+  esac
+fi
+
+if [ -n "$BLOCK_MESSAGE" ]; then
+  if [[ "$APPEND" == 'true' && -n "$COMPUTED_MESSAGE" ]]; then
+    COMPUTED_MESSAGE="${COMPUTED_MESSAGE}\n\n"
+  fi
+  COMPUTED_MESSAGE="${COMPUTED_MESSAGE}$BLOCK_MESSAGE"
+fi
+
+if [ -n "$COMPUTED_MESSAGE" ]; then
+  COMPUTED_MESSAGE="${COMPUTED_MESSAGE}"
+  COMPUTED_MESSAGE=$(printf "${COMPUTED_MESSAGE}" | sed -z 's/\n/\\n/g' | sed -r 's/"/\\\"/g' | sed -e 's/\r//g')
+  # avoid error if message is too long (total message must be less than 3001 characters)
+  COMPUTED_MESSAGE=${COMPUTED_MESSAGE:0:3000}
+  echo 'result<<EOF'
+  echo -n "${COMPUTED_MESSAGE}"
+  echo ''
+  echo 'EOF'
+else
+  echo 'result='
+fi
diff --git a/.github/actions/send-teams-notification/tests/sample-commit-message.txt b/.github/actions/send-teams-notification/tests/sample-commit-message.txt
new file mode 100644
index 000000000..eb9a7786e
--- /dev/null
+++ b/.github/actions/send-teams-notification/tests/sample-commit-message.txt
@@ -0,0 +1,5 @@
+AAE-12140 Check and fix inconsistent scenarios in UAT (#734)
+
+* AAE-12140 Add assertion to check for correct application status
+
+Co-authored-by: Elias Ricken de Medeiros <26007058+erdemedeiros@users.noreply.github.com>
diff --git a/.github/actions/send-teams-notification/tests/sample-long-message-cut.txt b/.github/actions/send-teams-notification/tests/sample-long-message-cut.txt
new file mode 100644
index 000000000..b5b5a327a
--- /dev/null
+++ b/.github/actions/send-teams-notification/tests/sample-long-message-cut.txt
@@ -0,0 +1 @@
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor.\nAenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec,\npellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu.\n\nIn enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt.\nCras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim.\n\nAliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet.\nEtiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus.\nMaecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel,\nluctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante.\n\nEtiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget\nbibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut,\nmollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla. Vestibulum ante ipsum primis in faucibus\norci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia. Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget,\nimperdiet nec, imperdiet iaculis, ipsum. Sed aliquam ultrices mauris. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris.\nPraesent adipiscing. Phasellus ullamcorper ipsum rutrum nunc. Nunc nonummy metus. Vestibulum volutpat pretium libero. Cras id dui.\n\nAenean ut eros et nisl sagittis vestibulum. Nullam nulla eros, ultricies sit amet, nonummy id, imperdiet feugiat, pede. Sed lectus. Donec mollis\nhendrerit risus. Phasellus nec sem in justo pellentesque facilisis. Etiam imperdiet imperdiet orci. Nunc nec neque. Phasellus leo dolor, tempus non,\nauctor et, hendrerit quis, nisi. Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. Maecenas malesuada.\n\nPraesent congue erat at massa. Sed cursus turpis vitae tortor. Donec posuere vulputate arcu. Phasellus accumsan cursus velit. Vestibulum ante\nipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed aliquam, nisi quis porttitor congue, elit erat euismod orci, ac\nplacerat dolor lectus quis orci. Phasellus consectetuer vestibulum elit. Aenean tellus metus, bibendum sed, posuere ac, mattis non, nunc.\nVestibulum fringilla pede sit amet augue. In turpis. Pellentesque posuere. Praes
diff --git a/.github/actions/send-teams-notification/tests/sample-long-message.txt b/.github/actions/send-teams-notification/tests/sample-long-message.txt
new file mode 100644
index 000000000..4bfa2e719
--- /dev/null
+++ b/.github/actions/send-teams-notification/tests/sample-long-message.txt
@@ -0,0 +1,29 @@
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor.
+Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec,
+pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu.
+
+In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt.
+Cras dapibus. Vivamus elementum semper nisi. Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim.
+
+Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet.
+Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus.
+Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel,
+luctus pulvinar, hendrerit id, lorem. Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante.
+
+Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget
+bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut,
+mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla. Vestibulum ante ipsum primis in faucibus
+orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia. Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget,
+imperdiet nec, imperdiet iaculis, ipsum. Sed aliquam ultrices mauris. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris.
+Praesent adipiscing. Phasellus ullamcorper ipsum rutrum nunc. Nunc nonummy metus. Vestibulum volutpat pretium libero. Cras id dui.
+
+Aenean ut eros et nisl sagittis vestibulum. Nullam nulla eros, ultricies sit amet, nonummy id, imperdiet feugiat, pede. Sed lectus. Donec mollis
+hendrerit risus. Phasellus nec sem in justo pellentesque facilisis. Etiam imperdiet imperdiet orci. Nunc nec neque. Phasellus leo dolor, tempus non,
+auctor et, hendrerit quis, nisi. Curabitur ligula sapien, tincidunt non, euismod vitae, posuere imperdiet, leo. Maecenas malesuada.
+
+Praesent congue erat at massa. Sed cursus turpis vitae tortor. Donec posuere vulputate arcu. Phasellus accumsan cursus velit. Vestibulum ante
+ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Sed aliquam, nisi quis porttitor congue, elit erat euismod orci, ac
+placerat dolor lectus quis orci. Phasellus consectetuer vestibulum elit. Aenean tellus metus, bibendum sed, posuere ac, mattis non, nunc.
+Vestibulum fringilla pede sit amet augue. In turpis. Pellentesque posuere. Praesent turpis.
+
+Aenean posuere, tortor sed cursus feugi.
diff --git a/.github/actions/send-teams-notification/tests/sample-needs.json b/.github/actions/send-teams-notification/tests/sample-needs.json
new file mode 100644
index 000000000..bf46f8b94
--- /dev/null
+++ b/.github/actions/send-teams-notification/tests/sample-needs.json
@@ -0,0 +1,10 @@
+{
+  "build": {
+    "result": "success",
+    "outputs": {}
+  },
+  "promote": {
+    "result": "failure",
+    "outputs": {}
+  }
+}
diff --git a/.github/actions/send-teams-notification/tests/send-teams-notification.bats b/.github/actions/send-teams-notification/tests/send-teams-notification.bats
new file mode 100644
index 000000000..a290300ac
--- /dev/null
+++ b/.github/actions/send-teams-notification/tests/send-teams-notification.bats
@@ -0,0 +1,278 @@
+setup() {
+    # Runs everywhere
+    DIR="$( cd "$( dirname "$BATS_TEST_FILENAME" )" >/dev/null 2>&1 && pwd )"
+    PATH="$DIR/..:$PATH"
+
+    # Mock send-teams-notification defaults
+    export PR_TITLE="fix(jx-updatebot-pr): update release binary version to 0.3.13 #158"
+    export ISSUE_BODY=$(cat << 'body'
+This PR adds support for retrying `jx-updatebot-pr` action in case there is a race condition on the target pr branch due to a concurrent commit from another project, i.e.
+
+```
+- uses: Alfresco/alfresco-build-tools/.github/actions/jx-updatebot-pr@ref
+  with:
+    retries: '3'
+    retries-wait: '10'
+
+```
+body
+)
+    export COMMIT_MESSAGE=$(cat << 'commit'
+fix: update retry inputs to use string type
+
+* use strings
+* add tests
+commit
+)
+}
+
+@test "basic teams message" {
+    export BLOCK_MESSAGE="my custom message"
+
+    run compute-message.sh
+
+    [ "$status" -eq 0 ]
+
+    expected_output=$(cat << BATS
+result<<EOF
+my custom message
+EOF
+BATS
+)
+
+    [ "$output" = "$expected_output" ]
+}
+
+@test "pull_request teams message" {
+    export EVENT_NAME=pull_request
+
+    run compute-message.sh
+
+    [ "$status" -eq 0 ]
+
+    expected_output=$(cat << BATS
+result<<EOF
+fix(jx-updatebot-pr): update release binary version to 0.3.13 #158
+EOF
+BATS
+)
+
+    [ "$output" = "$expected_output" ]
+}
+
+@test "multiline markdown for issues teams message" {
+    export EVENT_NAME=issues
+
+    run compute-message.sh
+
+    [ "$status" -eq 0 ]
+
+    expected_output=$(cat << 'BATS'
+result<<EOF
+This PR adds support for retrying `jx-updatebot-pr` action in case there is a race condition on the target pr branch due to a concurrent commit from another project, i.e.\n\n```\n- uses: Alfresco/alfresco-build-tools/.github/actions/jx-updatebot-pr@ref\n  with:\n    retries: '3'\n    retries-wait: '10'\n\n```
+EOF
+BATS
+)
+
+    [ "$output" = "$expected_output" ]
+}
+
+@test "multiline commit message for default teams message" {
+    export EVENT_NAME=whatever
+
+    run compute-message.sh
+
+    [ "$status" -eq 0 ]
+
+    expected_output=$(cat << 'BATS'
+result<<EOF
+fix: update retry inputs to use string type\n\n* use strings\n* add tests
+EOF
+BATS
+)
+
+    [ "$output" = "$expected_output" ]
+}
+
+@test "multiline commit message using CTRL-M" {
+    export EVENT_NAME=whatever
+    export COMMIT_MESSAGE=$(<$BATS_TEST_DIRNAME/sample-commit-message.txt)
+
+    run compute-message.sh
+
+    [ "$status" -eq 0 ]
+
+    expected_output=$(cat << 'BATS'
+result<<EOF
+AAE-12140 Check and fix inconsistent scenarios in UAT (#734)\n\n* AAE-12140 Add assertion to check for correct application status\n\nCo-authored-by: Elias Ricken de Medeiros <26007058+erdemedeiros@users.noreply.github.com>
+EOF
+BATS
+)
+
+    [ "$output" = "$expected_output" ]
+}
+
+@test "empty teams message" {
+    export COMMIT_MESSAGE=""
+
+    run compute-message.sh
+
+    [ "$status" -eq 0 ]
+
+    expected_output=$(cat << BATS
+result=
+BATS
+)
+
+    [ "$output" = "$expected_output" ]
+}
+
+@test "empty block message" {
+    export BLOCK_MESSAGE=""
+
+    run compute-message.sh
+
+    [ "$status" -eq 0 ]
+
+    expected_output=$(cat << BATS
+result<<EOF
+fix: update retry inputs to use string type\n\n* use strings\n* add tests
+EOF
+BATS
+)
+
+    [ "$output" = "$expected_output" ]
+}
+
+@test "message with double quotes" {
+    export BLOCK_MESSAGE="Message with \"double quotes\""
+
+    run compute-message.sh
+
+    [ "$status" -eq 0 ]
+
+    expected_output=$(cat << BATS
+result<<EOF
+Message with \"double quotes\"
+EOF
+BATS
+)
+
+    [ "$output" = "$expected_output" ]
+}
+
+@test "message with single quotes" {
+    export BLOCK_MESSAGE="Message with 'single quotes'"
+
+    run compute-message.sh
+
+    [ "$status" -eq 0 ]
+
+    expected_output=$(cat << BATS
+result<<EOF
+Message with 'single quotes'
+EOF
+BATS
+)
+
+    [ "$output" = "$expected_output" ]
+}
+
+@test "empty block message append" {
+    export EVENT_NAME=push
+    export BLOCK_MESSAGE=""
+    export APPEND="true"
+
+    run compute-message.sh
+
+    [ "$status" -eq 0 ]
+
+    expected_output=$(cat << BATS
+result<<EOF
+fix: update retry inputs to use string type\n\n* use strings\n* add tests
+EOF
+BATS
+)
+
+    [ "$output" = "$expected_output" ]
+}
+
+@test "block message append" {
+    export EVENT_NAME=push
+    export BLOCK_MESSAGE="bye"
+    export APPEND="true"
+
+    run compute-message.sh
+
+    [ "$status" -eq 0 ]
+
+    expected_output=$(cat << BATS
+result<<EOF
+fix: update retry inputs to use string type\n\n* use strings\n* add tests\n\nbye
+EOF
+BATS
+)
+
+    [ "$output" = "$expected_output" ]
+}
+
+@test "block message append empty default" {
+    export EVENT_NAME=push
+    export COMMIT_MESSAGE=""
+    export BLOCK_MESSAGE="bye"
+    export APPEND="true"
+
+    run compute-message.sh
+
+    [ "$status" -eq 0 ]
+
+    expected_output=$(cat << BATS
+result<<EOF
+bye
+EOF
+BATS
+)
+
+    [ "$output" = "$expected_output" ]
+}
+
+@test "long message" {
+    export COMMIT_MESSAGE=$(<$BATS_TEST_DIRNAME/sample-long-message.txt)
+    export CUT_MESSAGE=$(<$BATS_TEST_DIRNAME/sample-long-message-cut.txt)
+
+    run compute-message.sh
+
+    [ "$status" -eq 0 ]
+
+    expected_output=$(cat << BATS
+result<<EOF
+${CUT_MESSAGE}
+EOF
+BATS
+)
+
+    [ "$output" = "$expected_output" ]
+
+}
+
+@test "needs" {
+    export NEEDS_JSON=$(<$BATS_TEST_DIRNAME/sample-needs.json)
+    export NEEDS=$(echo $NEEDS_JSON | jq -r 'to_entries[] | "\(.key): \(.value.result)"')
+
+    run compute-message.sh
+
+    [ "$status" -eq 0 ]
+
+    expected_output=$(cat << 'BATS'
+result<<EOF
+build: success\npromote: failure\n\nfix: update retry inputs to use string type\n\n* use strings\n* add tests
+EOF
+BATS
+)
+
+    echo $output
+    echo $expected_output
+
+    [ "$output" = "$expected_output" ]
+
+}
diff --git a/docs/README.md b/docs/README.md
index f9116c87c..b86db2b96 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1358,6 +1358,8 @@ This will give the following sample output on the GH Actions run summary (when u
 
 ![GH Actions Summary Report Portal](./images/rp-gh-summary.png)
 
+The equivalent output "teams-message" (using standard markdown format) is available for Teams messages.
+
 ### resolve-preview-name
 
 Resolve preview name based on the PR number and run number:
@@ -1466,52 +1468,15 @@ The above webhook URL is a mandatory parameter. Make sure to [Create Incoming We
 
 Sample of a SUCCESS notification on a `push` event.
 
-![Teams Success](./images/teams-success.png)
-
-Sample of a FAILURE notification on a `push` event.
+![Teams Success](./images/send-teams-push-success.png)
 
-![Teams Failure](./images/teams-failure.png)
+Sample of a SUCCESS notification on a `pull_request` event.
 
-Below is the detailed description of the above message card.
+![Teams Success](./images/send-teams-pr-success.png)
 
-- The `summary` of the message card tells you the author, event name, and the repo where it was performed.
-- The below `Changelog` section will list the commits.
-- The `build_and_test` and `publish` are example job names passed via the `needs` input. If you want to display needs status, you need to explicitly send the JSON object of the `needs` context as an input.
+Sample of a FAILURE notification on a `push` event.
 
-  ```yml
-      uses: Alfresco/alfresco-build-tools/.github/actions/send-teams-notification@ref
-      with:
-        webhook-url: ${{ secrets.MSTEAMS_WEBHOOK }}
-        needs: ${{ toJson(needs) }}
-  ```
-
-  The `Failure` status with an image reflects the workflow status.
-  For the ease of access, these action buttons will perform the respective actions.
-
-  **Note:** You're free to configure any action items based on your workflow need. You just need to send the JSON against the `overwrite` input.
-
-  ```json
-    {
-       "@type": "OpenUri",
-       "name": "Repository",
-       "targets": [
-         {
-            "os": "default",
-            "uri": "${{ github.server_url }}/${{ github.repository }}"
-         }
-      ]
-   }
-  ```
-
-  **Details of input parameter of this action:**
-
-  | Input       | Description                                                                       |
-  |-------------|-----------------------------------------------------------------------------------|
-  | webhook-url | URL of the MS Teams incoming webhook.                                             |
-  | needs       | JSON parsed needs context.                                                        |
-  | dry-run     | Do not actually send the message card to the teams channel.                       |
-  | raw         | The entire JSON object of the Message Card which will be sent to Microsoft Teams. |
-  | overwrite   | JSON like object to overwrite default message.                                    |
+![Teams Failure](./images/send-teams-push-failure.png)
 
 ### setup-docker
 
diff --git a/docs/images/send-teams-pr-success.png b/docs/images/send-teams-pr-success.png
new file mode 100644
index 000000000..7d4336c68
Binary files /dev/null and b/docs/images/send-teams-pr-success.png differ
diff --git a/docs/images/send-teams-push-failure.png b/docs/images/send-teams-push-failure.png
new file mode 100644
index 000000000..b7d3d1760
Binary files /dev/null and b/docs/images/send-teams-push-failure.png differ
diff --git a/docs/images/send-teams-push-success.png b/docs/images/send-teams-push-success.png
new file mode 100644
index 000000000..d4528c8a3
Binary files /dev/null and b/docs/images/send-teams-push-success.png differ
diff --git a/docs/images/teams-failure.png b/docs/images/teams-failure.png
deleted file mode 100644
index 090180d0b..000000000
Binary files a/docs/images/teams-failure.png and /dev/null differ
diff --git a/docs/images/teams-success.png b/docs/images/teams-success.png
deleted file mode 100644
index e2352567a..000000000
Binary files a/docs/images/teams-success.png and /dev/null differ
diff --git a/version.txt b/version.txt
index 33edba2d0..684f62b80 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v8.4.0
+v8.5.0