diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index bbd90e1..01fc2b7 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
   merge_group:
   push:
-    branches: ["master", "main", "v1"]
+    branches: ["master", "v1", "v2"]
 
 jobs:
   gradle:
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/setup-java@v5
         with:
           distribution: temurin
-          java-version: 8
+          java-version: ${{ (github.ref == 'refs/heads/v1' || github.base_ref == 'v1') && '8' || '17' }}
 
       - name: Set up Gradle
         uses: gradle/actions/setup-gradle@50e97c2cd7a37755bbfafc9c5b7cafaece252f6e # v6.1.0
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 4e038cd..d2d2850 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -2,9 +2,9 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "master", "2.0.0-dev" ]
+    branches: [ "master", "v1", "v2"]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "master", "v1" ]
   schedule:
     - cron: "30 19 * * 6"
 
@@ -26,6 +26,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
+      - uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: ${{ (github.ref == 'refs/heads/v1' || github.base_ref == 'v1') && '8' || '17' }}
+
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v4
         with:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 9829b1a..0c87ece 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -18,7 +18,7 @@ jobs:
   rl-scanner:
     uses: ./.github/workflows/rl-secure.yml
     with:
-      java-version: 8
+      java-version: ${{ (github.ref == 'refs/heads/v1' || github.base_ref == 'v1') && '8' || '17' }}
       artifact-name: "auth0-java-mvc-common.tgz"
     secrets:
       RLSECURE_LICENSE: ${{ secrets.RLSECURE_LICENSE }}
@@ -32,7 +32,7 @@ jobs:
     uses: ./.github/workflows/java-release.yml
     needs: rl-scanner
     with:
-      java-version: 8.0.382-tem
+      java-version: ${{ (github.ref == 'refs/heads/v1' || github.base_ref == 'v1') && '8' || '17' }}
     secrets:
       ossr-username: ${{ secrets.OSSR_USERNAME }}
       ossr-token: ${{ secrets.OSSR_TOKEN }}
diff --git a/.github/workflows/sca_scan.yml b/.github/workflows/sca_scan.yml
index 86239c0..5f82e75 100644
--- a/.github/workflows/sca_scan.yml
+++ b/.github/workflows/sca_scan.yml
@@ -2,14 +2,14 @@ name: SCA
 
 on:
   push:
-    branches: ["master"]
+    branches: ["master", "v1", "v2"]
   pull_request:
-    branches: ["master"]
+    branches: ["master", "v1", "v2"]
 
 jobs:
   snyk-cli:
     uses: auth0/devsecops-tooling/.github/workflows/sca-scan.yml@main
     with:
       additional-arguments: "--exclude=README.md"
-      java-version: "8"
+      java-version: ${{ (github.ref == 'refs/heads/v1' || github.base_ref == 'v1') && '8' || '17' }}
     secrets: inherit
diff --git a/.version b/.version
index 32bd932..60b5ccb 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-1.12.0
\ No newline at end of file
+2.0.0-beta.0
\ No newline at end of file