diff --git a/.github/workflows/psp-reusable.yml b/.github/workflows/build-and-test.yml
similarity index 96%
rename from .github/workflows/psp-reusable.yml
rename to .github/workflows/build-and-test.yml
index c363deb437221..41af1a40686ba 100644
--- a/.github/workflows/psp-reusable.yml
+++ b/.github/workflows/build-and-test.yml
@@ -1,4 +1,4 @@
-name: PSP-Reusable
+name: Reusable build and test
 on:
   workflow_call:
     inputs:
@@ -21,7 +21,7 @@ env:
 
 jobs:
   build:
-    name: Build PSP
+    name: Build
     runs-on: ${{ inputs.os }}
     steps:
       - name: Clone repository
@@ -50,7 +50,7 @@ jobs:
           retention-days: 1
 
   test:
-    name: Test PSP
+    name: Test
     runs-on: ${{ inputs.os }}
     needs: build
     
@@ -93,8 +93,8 @@ jobs:
             src/src/test/*/tmp_check
           retention-days: 3
 
-  test_tde:
-    name: Test PSP with TDE
+  test-default-tde:
+    name: Test with TDE as default access method
     runs-on: ${{ inputs.os }}
     if: inputs.build_script == 'make'
     needs: build
diff --git a/.github/workflows/matirx.yml b/.github/workflows/matirx.yml
new file mode 100644
index 0000000000000..39248232c4a4d
--- /dev/null
+++ b/.github/workflows/matirx.yml
@@ -0,0 +1,62 @@
+name: Build and Test
+on:
+  pull_request:
+  push:
+    branches:
+      - TDE_REL_17_STABLE
+  workflow_dispatch:
+
+jobs:
+  main:
+    name: Main matrix
+    strategy:
+      matrix:
+        os: [ubuntu-22.04]
+        compiler: [gcc, clang]
+        build_type: [debugoptimized]
+        build_script: [make, meson]
+    uses: ./.github/workflows/build-and-test.yml
+    with:
+        os: ${{ matrix.os }}
+        compiler: ${{ matrix.compiler }}
+        build_type: ${{ matrix.build_type }}
+        build_script: ${{ matrix.build_script }}
+    secrets: inherit
+
+  arm:
+    name: ARM matrix
+    if: github.event_name != 'pull_request'
+    strategy:
+      matrix:
+        os: [ubuntu-22.04-arm]
+        compiler: [gcc, clang]
+        build_type: [debugoptimized]
+        build_script: [make, meson]
+    uses: ./.github/workflows/build-and-test.yml
+    with:
+        os: ${{ matrix.os }}
+        compiler: ${{ matrix.compiler }}
+        build_type: ${{ matrix.build_type }}
+        build_script: ${{ matrix.build_script }}
+    secrets: inherit
+
+  slack-notification:
+    if: ${{ failure() }} && github.event_name == 'push'
+    needs: [ main, arm ]
+    name: Slack Notification
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Notify
+        uses: slackapi/slack-github-action@v2.1.0
+        with:
+          webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
+          webhook-type: incoming-webhook
+          payload: |
+            blocks:
+              - type: "section"
+                text:
+                  type: "mrkdwn"
+                  text: "Workflow *${{ github.workflow }}* failed on branch *${{ github.head_ref }}*\n
+                   Commit: <${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }}|${{ github.sha }}>\n
+                   \n
+                   <${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}|View logs>"
diff --git a/.github/workflows/pgindent.yml b/.github/workflows/pgindent.yml
index c65ee645a8ba2..c1a99c63082e7 100644
--- a/.github/workflows/pgindent.yml
+++ b/.github/workflows/pgindent.yml
@@ -1,12 +1,8 @@
-name: PgIndent
+name: Format
 on:
   pull_request:
   workflow_dispatch:
 
-defaults:
-  run:
-    working-directory: ./src
-
 jobs:
   check:
     name: Check
@@ -15,7 +11,6 @@ jobs:
       - name: Clone repository
         uses: actions/checkout@v4
         with:
-          path: 'src'
           submodules: recursive
 
       - name: Install dependencies
diff --git a/.github/workflows/psp-matrix.yml b/.github/workflows/psp-matrix.yml
deleted file mode 100644
index 635ab9ed78454..0000000000000
--- a/.github/workflows/psp-matrix.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: PSP
-on:
-  pull_request:
-  push:
-    branches:
-      - TDE_REL_17_STABLE
-  workflow_dispatch:
-
-jobs:
-  build:
-    name: PSP
-    strategy:
-      matrix:
-        os: ['ubuntu-22.04']
-        compiler: [gcc, clang]
-        build_type: [debugoptimized]
-        build_script: [make, meson]
-    uses: ./.github/workflows/psp-reusable.yml
-    with:
-        os: ${{ matrix.os }}
-        compiler: ${{ matrix.compiler }}
-        build_type: ${{ matrix.build_type }}
-        build_script: ${{ matrix.build_script }}
-    secrets: inherit