diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 429e49cd5b..7c20d08fe0 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -10,7 +10,7 @@ on:
   pull_request:
     paths-ignore:
       - 'docs/**'
-    branches: [ main, v1, v2, next ]
+    branches: [ main, main-f8-5.x, v1, v2, next ]
   workflow_dispatch:
 jobs:
   check_format_and_unit_tests:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6fe3bd9dab..6a8da1687a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,6 +16,10 @@ jobs:
         if: ${{ startsWith(github.event.release.tag_name, 'v2.') }}
         with:
           ref: "v2"
+      - uses: actions/checkout@v3
+        if: ${{ endsWith(github.event.release.tag_name, 'f8-5.x') }}
+        with:
+          ref: "main-f8-5.x"
       - uses: actions/checkout@v3
         if: ${{ startsWith(github.event.release.tag_name, 'v3.') }}
       - name: Set up Java and Maven
@@ -57,6 +61,10 @@ jobs:
         if: ${{ startsWith(github.event.release.tag_name, 'v2.') }}
         with:
           ref: "v2"
+      - uses: actions/checkout@v3
+        if: ${{ endsWith(github.event.release.tag_name, 'f8-5.x') }}
+        with:
+          ref: "main-f8-5.x"
       - uses: actions/checkout@v3
         if: ${{ startsWith(github.event.release.tag_name, 'v3.') }}
       - name: Set up Java and Maven
@@ -86,6 +94,12 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           branch: "v2"
+      - name: Push changes v2
+        uses: ad-m/github-push-action@master
+        if: ${{ endsWith(github.event.release.tag_name, 'f8-5.x') }}
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          branch: "main-f8-5.x"
       - name: Push changes v3
         uses: ad-m/github-push-action@master
         if: ${{ startsWith(github.event.release.tag_name, 'v3.' ) }}
diff --git a/.github/workflows/snapshot-releases.yml b/.github/workflows/snapshot-releases.yml
index 866e50e133..e5f7d1c320 100644
--- a/.github/workflows/snapshot-releases.yml
+++ b/.github/workflows/snapshot-releases.yml
@@ -10,7 +10,7 @@ on:
   push:
     paths-ignore:
       - 'docs/**'
-    branches: [ main, v1, v2, next ]
+    branches: [ main, main-f8-5.x, v1, v2, next ]
   workflow_dispatch:
 jobs:
   test: