diff --git a/.github/renovate.json b/.github/renovate.json
index b317c8f02..20c1d249b 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -10,7 +10,7 @@
     "automerge": true,
     "automergeType": "branch"
   },
-  "baseBranches": ["main", "stable"],
+  "baseBranches": ["main"],
   "labels": ["dependencies"],
   "packageRules": [
     {
diff --git a/.github/workflows/analyzer.yml b/.github/workflows/analyzer.yml
index eadfafafa..dbc0d0352 100644
--- a/.github/workflows/analyzer.yml
+++ b/.github/workflows/analyzer.yml
@@ -3,7 +3,7 @@ name: Analyzer
 on:
   workflow_dispatch:
   push:
-    branches: [main, stable]
+    branches: [main, stable-*]
     paths:
       - .github/workflows/_python.yml
       - .github/workflows/analyzer.yml
@@ -12,7 +12,7 @@ on:
       - tools/python*
 
   pull_request:
-    branches: [main, stable]
+    branches: [main, stable-*]
     paths:
       - .github/workflows/_python.yml
       - .github/workflows/analyzer.yml
diff --git a/.github/workflows/api-client.yml b/.github/workflows/api-client.yml
index 7fc62eb74..3ef0d9389 100644
--- a/.github/workflows/api-client.yml
+++ b/.github/workflows/api-client.yml
@@ -3,7 +3,7 @@ name: API Client
 on:
   workflow_dispatch:
   push:
-    branches: [main, stable]
+    branches: [main, stable-*]
     paths:
       - .github/workflows/_python.yml
       - .github/workflows/api-client.yml
@@ -12,7 +12,7 @@ on:
       - tools/python*
 
   pull_request:
-    branches: [main, stable]
+    branches: [main, stable-*]
     paths:
       - .github/workflows/_python.yml
       - .github/workflows/api-client.yml
diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml
index e0e5cb97b..80504fcb7 100644
--- a/.github/workflows/api.yml
+++ b/.github/workflows/api.yml
@@ -3,7 +3,7 @@ name: API
 on:
   workflow_dispatch:
   push:
-    branches: [main, stable]
+    branches: [main, stable-*]
     paths:
       - .github/workflows/_python.yml
       - .github/workflows/api.yml
@@ -12,7 +12,7 @@ on:
       - tools/python*
 
   pull_request:
-    branches: [main, stable]
+    branches: [main, stable-*]
     paths:
       - .github/workflows/_python.yml
       - .github/workflows/api.yml
diff --git a/.github/workflows/container.yml b/.github/workflows/container.yml
index 40e07daa3..29be28248 100644
--- a/.github/workflows/container.yml
+++ b/.github/workflows/container.yml
@@ -3,9 +3,9 @@ name: Container
 on:
   push:
     tags: ["[0-9]+.[0-9]+.[0-9]+*"]
-    branches: [main, stable]
+    branches: [main, stable-*]
   pull_request:
-    branches: [main, stable]
+    branches: [main, stable-*]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 2ebda83e4..e1f2d52e2 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -2,14 +2,14 @@ name: Docs
 
 on:
   push:
-    branches: [main, stable]
+    branches: [main, stable-*]
     paths:
       - .github/vale/**
       - .github/workflows/docs.yml
       - docs/**
 
   pull_request:
-    branches: [main, stable]
+    branches: [main, stable-*]
     paths:
       - .github/vale/**
       - .github/workflows/docs.yml
diff --git a/.github/workflows/legacy.yml b/.github/workflows/legacy.yml
index b0f8b3b7a..c8371cfcc 100644
--- a/.github/workflows/legacy.yml
+++ b/.github/workflows/legacy.yml
@@ -3,14 +3,14 @@ name: Legacy
 on:
   workflow_dispatch:
   push:
-    branches: [main, stable]
+    branches: [main, stable-*]
     paths:
       - .github/workflows/legacy.yml
       - api/**
       - legacy/**
 
   pull_request:
-    branches: [main, stable]
+    branches: [main, stable-*]
     paths:
       - .github/workflows/legacy.yml
       - api/**
diff --git a/.github/workflows/playout.yml b/.github/workflows/playout.yml
index b09b8cc40..98a76b810 100644
--- a/.github/workflows/playout.yml
+++ b/.github/workflows/playout.yml
@@ -3,7 +3,7 @@ name: Playout
 on:
   workflow_dispatch:
   push:
-    branches: [main, stable]
+    branches: [main, stable-*]
     paths:
       - .github/workflows/_python.yml
       - .github/workflows/playout.yml
@@ -13,7 +13,7 @@ on:
       - tools/python*
 
   pull_request:
-    branches: [main, stable]
+    branches: [main, stable-*]
     paths:
       - .github/workflows/_python.yml
       - .github/workflows/playout.yml
diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
index 2dce8042d..af0bb9e2b 100644
--- a/.github/workflows/project.yml
+++ b/.github/workflows/project.yml
@@ -3,10 +3,10 @@ name: Project
 on:
   workflow_dispatch:
   push:
-    branches: [main, stable]
+    branches: [main, stable-*]
   pull_request:
     types: [opened, reopened, synchronize, edited]
-    branches: [main, stable]
+    branches: [main, stable-*]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/.github/workflows/shared.yml b/.github/workflows/shared.yml
index fa5a550a2..407823269 100644
--- a/.github/workflows/shared.yml
+++ b/.github/workflows/shared.yml
@@ -3,7 +3,7 @@ name: Shared
 on:
   workflow_dispatch:
   push:
-    branches: [main, stable]
+    branches: [main, stable-*]
     paths:
       - .github/workflows/_python.yml
       - .github/workflows/shared.yml
@@ -11,7 +11,7 @@ on:
       - tools/python*
 
   pull_request:
-    branches: [main, stable]
+    branches: [main, stable-*]
     paths:
       - .github/workflows/_python.yml
       - .github/workflows/shared.yml
diff --git a/.github/workflows/worker.yml b/.github/workflows/worker.yml
index f2380d3e2..27f98a7d8 100644
--- a/.github/workflows/worker.yml
+++ b/.github/workflows/worker.yml
@@ -3,7 +3,7 @@ name: Worker
 on:
   workflow_dispatch:
   push:
-    branches: [main, stable]
+    branches: [main, stable-*]
     paths:
       - .github/workflows/_python.yml
       - .github/workflows/worker.yml
@@ -11,7 +11,7 @@ on:
       - tools/python*
 
   pull_request:
-    branches: [main, stable]
+    branches: [main, stable-*]
     paths:
       - .github/workflows/_python.yml
       - .github/workflows/worker.yml
diff --git a/docs/contribute.md b/docs/contribute.md
index 1bf69a954..4b47b7c50 100644
--- a/docs/contribute.md
+++ b/docs/contribute.md
@@ -13,8 +13,8 @@ LibreTime development workflows follow the standardized [C4 development process]
 - [2.4. Development Process](https://rfc.zeromq.org/spec/42/#24-development-process)
   - `16.` Maintainers MAY NOT merge incorrect patches.
 - [2.5. Branches and Releases](https://rfc.zeromq.org/spec/42/#25-branches-and-releases)
-  - `1.` The project SHALL have a development branch (`main`) that always holds the latest in-progress version and SHOULD always build. The project MAY have a bug fixes only branch (`stable`) that always holds the current stable version and SHOULD always build.
-  - `3.` To make a stable release a Maintainer shall tag the repository. Stable releases SHALL always be released from the repository `main` or `stable` branches.
+  - `1.` The project SHALL have a development branch (`main`) that always holds the latest in-progress version and SHOULD always build. The project MAY have a bug fixes only branch (`stable-*`) that always holds the current stable version and SHOULD always build.
+  - `3.` To make a stable release a Maintainer shall tag the repository. Stable releases SHALL always be released from the repository `main` or `stable-*` branches.
 
 ## Contribute financially
 
diff --git a/docs/contributor-manual/development-workflows.md b/docs/contributor-manual/development-workflows.md
index 867828d0a..cfa13172e 100644
--- a/docs/contributor-manual/development-workflows.md
+++ b/docs/contributor-manual/development-workflows.md
@@ -7,7 +7,7 @@ title: Development workflows
 LibreTime uses [Github pull requests to manage changes](https://docs.github.com/en/get-started/quickstart/contributing-to-projects). The workflow looks like this:
 
 - [Create a fork of the project](https://docs.github.com/en/get-started/quickstart/fork-a-repo).
-- Check out the `main` branch. If you're making a minor or small documentation change you can check out the `stable` branch.
+- Check out the `main` branch.
 - Create a new branch based on the checked out branch.
 - Work on your changes locally. Try to keep each commit small to make reviews easier.
 - Lint and test the codebase, for example using the `make lint` or `make test` commands inside the app folder you want to check.
diff --git a/docs/contributor-manual/releases.md b/docs/contributor-manual/releases.md
index 43c6dbbe4..e1969406d 100644
--- a/docs/contributor-manual/releases.md
+++ b/docs/contributor-manual/releases.md
@@ -15,8 +15,8 @@ Once a release is desired, checkout the release branch:
 ```bash
 # For a release on the main branch
 git checkout release-please--branches--main--components--libretime
-# For a release on the stable branch
-git checkout release-please--branches--stable--components--libretime
+# For a release on the stable-4.x branch
+git checkout release-please--branches--stable-4.x--components--libretime
 ```
 
 ### 2. Release note
diff --git a/docs/releases/README.md b/docs/releases/README.md
index 8013b7d64..e1c3b3115 100644
--- a/docs/releases/README.md
+++ b/docs/releases/README.md
@@ -30,3 +30,4 @@ New releases target the current stable distributions release, and development sh
 | Versions     |              |            |              |             |
 | 3.0.x        |  deprecated  | deprecated | recommended  | recommended |
 | 3.1.x        |              |            | recommended  | recommended |
+| 4.0.x        |              |            | recommended  | recommended |