diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml
index 3be31cff616..a2b9837a632 100644
--- a/.github/workflows/gradle-build.yml
+++ b/.github/workflows/gradle-build.yml
@@ -8,7 +8,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  build-java-latest:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -48,6 +48,34 @@ jobs:
             **/gradle/**
             Scripts/**
 
+  build-java-8:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: 8
+          distribution: 'temurin'
+      - name: Grant Execute permission for gradlew
+        run: chmod +x gradlew
+      - name: Build with Java 8
+        working-directory: ./java-8
+        run: .././gradlew build
+
+  build:
+    needs: [build-java-latest, build-java-8]
+    runs-on: ubuntu-latest
+    if: ${{ always() }}
+    steps:
+      - name: Determine build status
+        run: |
+          if [ "${{ needs.build-java-latest.result }}" == "success" ] && [ "${{ needs.build-java-8.result }}" == "success" ]; then
+            exit 0
+          else
+            exit 1
+          fi
+
   compare-packages:
     needs: build
     runs-on: ubuntu-latest
diff --git a/android/build.gradle b/android/build.gradle
index 294a3cb13ed..571d665222c 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -25,13 +25,13 @@ apply plugin: "com.github.ManifestClasspath"
 android {
     namespace 'com.microsoft.graph'
 
-    compileSdkVersion 34
+    compileSdkVersion 35
 
     defaultConfig {
         versionCode 1
         versionName "1.0"
         minSdkVersion 26
-        targetSdkVersion 34
+        targetSdkVersion 35
     }
 
     buildTypes {
diff --git a/gradle.properties b/gradle.properties
index c28d13ac7aa..b82610cfc6c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,7 +19,7 @@
 
 # The size of the library demands a large amount of RAM to build. Increase as necessary if you get GC errors
 ## linux requires 10G, OSX requires 11G
-org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=2g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx8g -XX:MaxMetaspaceSize=2g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 org.gradle.caching=true
 
diff --git a/java-8/.gitignore b/java-8/.gitignore
new file mode 100644
index 00000000000..7f6823bcc0f
--- /dev/null
+++ b/java-8/.gitignore
@@ -0,0 +1,2 @@
+.gradle
+build/
diff --git a/java-8/build.gradle b/java-8/build.gradle
new file mode 100644
index 00000000000..56ce1751c3b
--- /dev/null
+++ b/java-8/build.gradle
@@ -0,0 +1,31 @@
+plugins {
+    // Apply the java-library plugin to add support for Java Library
+    id 'java-library'
+    id 'eclipse'
+}
+
+repositories {
+    mavenCentral()
+}
+
+sourceSets {
+    main {
+        java {
+            srcDirs = ['../src']
+            exclude 'test/**'
+        }
+    }
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
+    withSourcesJar()
+}
+
+tasks.jar {
+    zip64(true)
+}
+
+apply from: "../gradle/dependencies.gradle"
diff --git a/java-8/daemon-jvm.properties b/java-8/daemon-jvm.properties
new file mode 100644
index 00000000000..3bd3a411829
--- /dev/null
+++ b/java-8/daemon-jvm.properties
@@ -0,0 +1,2 @@
+#This file is generated by updateDaemonJvm
+toolchainVersion=8
diff --git a/java-8/gradle.properties b/java-8/gradle.properties
new file mode 100644
index 00000000000..51d218b5fc1
--- /dev/null
+++ b/java-8/gradle.properties
@@ -0,0 +1,3 @@
+org.gradle.jvmargs=-Xmx8g -XX:MaxMetaspaceSize=2g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+
+mavenArtifactId      = msgraph-sdk-java
diff --git a/java-8/settings.gradle b/java-8/settings.gradle
new file mode 100644
index 00000000000..f61f5ddf93b
--- /dev/null
+++ b/java-8/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'msgraph-sdk-java'