diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index bf028ffe9a..b834d45005 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -45,7 +45,7 @@ updates:
     # Spring Cloud dependencies
     # spring-cloud-dependencies-parent should be eventually removed per #1294
     - dependency-name: "org.springframework.cloud:spring-cloud-*"
-      versions: ["2022.x", "2023.x", "4.x"]
+      versions: ["2022.x", "2023.x", "2024.x"]
     # Spring Shell dependencies
     - dependency-name: "org.springframework.shell:spring-shell-starter"
       versions: ["3.x"]
@@ -76,7 +76,7 @@ updates:
       versions: [">=3.2.0"]
     # Spring Cloud dependencies
     - dependency-name: "org.springframework.cloud:spring-cloud-*"
-      versions: ["2023.x"]
+      versions: ["2023.x", "2024.x"]
     # Spring Shell dependencies
     - dependency-name: "org.springframework.shell:spring-shell-starter"
       versions: [">=3.2.0"]
@@ -85,3 +85,33 @@ updates:
       versions: [">=4.2.0"]
     - dependency-name: "org.springframework.cloud:spring-cloud-starter-bootstrap"
       versions: [">=4.2.0"]
+      
+- package-ecosystem: maven
+  directory: "/"
+  schedule:
+    interval: daily
+  commit-message:
+    # Prefix all commit messages with "deps: "
+    prefix: "deps"
+  open-pull-requests-limit: 10
+  target-branch: "5.x"
+  labels:
+    - "5.x dependencies"
+  ignore:
+    # Ignore major version updates - these should be made manually
+    - dependency-name: "*"
+      update-types: [ "version-update:semver-major" ]
+    # Ignore formatter dependency versions used in codegen modules, since they are fixed for Java 8 support
+    - dependency-name: "com.coveo:fmt-maven-plugin"
+    - dependency-name: "com.google.googlejavaformat:google-java-format"
+    # Ignore dependencies corresponding to Spring Boot 3.4+, Spring Cloud 2024.x:
+    # Spring Boot dependencies
+    - dependency-name: "org.springframework.boot:spring-boot-*"
+      versions: [">=3.4.0"]
+    # Spring Cloud dependencies
+    - dependency-name: "org.springframework.cloud:spring-cloud-*"
+      versions: ["2024.x"]
+    # Spring Shell dependencies 3.4+ is meant to be used with Spring boot 3.4, which is part of
+    # the non-supported (by 5.x branch) Spring Cloud 2024
+    - dependency-name: "org.springframework.shell:spring-shell-starter"
+      versions: [">=3.4.0"]
\ No newline at end of file
diff --git a/.github/release-please.yml b/.github/release-please.yml
index 34e379fae9..574e5b9168 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -14,3 +14,7 @@ branches:
     handleGHRelease: true
     branch: 4.x
     extraFiles: ["README.adoc"]
+  - releaseType: java-yoshi
+    handleGHRelease: true
+    branch: 5.x
+    extraFiles: ["README.adoc"]
diff --git a/.github/workflows/NativeTests.yaml b/.github/workflows/NativeTests.yaml
index 14cea73bea..ff6f7f6adf 100644
--- a/.github/workflows/NativeTests.yaml
+++ b/.github/workflows/NativeTests.yaml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - 5.x
   pull_request:
     types: [opened, synchronize, reopened]
     paths-ignore:
diff --git a/.github/workflows/integrationTests.yaml b/.github/workflows/integrationTests.yaml
index 4a1e3f08ed..a37c948d12 100644
--- a/.github/workflows/integrationTests.yaml
+++ b/.github/workflows/integrationTests.yaml
@@ -6,6 +6,7 @@ on:
       - main
       - 3.x
       - 4.x
+      - 5.x
   pull_request:
     types: [opened, synchronize, reopened]
     paths-ignore:
diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml
index 6ae8dcce3d..ba7956fef5 100644
--- a/.github/workflows/renovate.yml
+++ b/.github/workflows/renovate.yml
@@ -16,5 +16,5 @@ jobs:
       - name: Run Renovate
         uses: renovatebot/forking-renovate@main
         with:
-          baseBranches: main,3.x,4.x
+          baseBranches: main,3.x,4.x,5.x
           createPullRequests: true
\ No newline at end of file
diff --git a/.github/workflows/unitTests.yaml b/.github/workflows/unitTests.yaml
index c5a5c6f1f9..1b94375ffc 100644
--- a/.github/workflows/unitTests.yaml
+++ b/.github/workflows/unitTests.yaml
@@ -6,6 +6,7 @@ on:
       - main
       - 3.x
       - 4.x
+      - 5.x
   pull_request:
   workflow_dispatch:
   schedule: