diff --git a/CHANGELOG.md b/CHANGELOG.md
index d69272450b4..6b6597cca52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,7 @@ ownCloud admins and users.
 
 * Change - Replace auto-uploads with automatic uploads: [#4252](https://github.com/owncloud/android/issues/4252)
 * Enhancement - Add status message when (un)setting av. offline from preview: [#4382](https://github.com/owncloud/android/issues/4382)
+* Enhancement - Upgraded AGP version to 8.7.2: [#4478](https://github.com/owncloud/android/issues/4478)
 * Enhancement - Added text labels for BottomNavigationView: [#4484](https://github.com/owncloud/android/issues/4484)
 
 ## Details
@@ -57,6 +58,14 @@ ownCloud admins and users.
    https://github.com/owncloud/android/issues/4382
    https://github.com/owncloud/android/pull/4482
 
+* Enhancement - Upgraded AGP version to 8.7.2: [#4478](https://github.com/owncloud/android/issues/4478)
+
+   The Android Gradle Plugin version has been upgraded to 8.7.2, together with
+   Gradle version (updated to 8.9) and JDK version (updated to JBR 17).
+
+   https://github.com/owncloud/android/issues/4478
+   https://github.com/owncloud/android/pull/4507
+
 * Enhancement - Added text labels for BottomNavigationView: [#4484](https://github.com/owncloud/android/issues/4484)
 
    Text labels have been added below the icons, and the active indicator feature is
diff --git a/changelog/unreleased/4507 b/changelog/unreleased/4507
new file mode 100644
index 00000000000..9b9367603a3
--- /dev/null
+++ b/changelog/unreleased/4507
@@ -0,0 +1,7 @@
+Enhancement: Upgraded AGP version to 8.7.2
+
+The Android Gradle Plugin version has been upgraded to 8.7.2, together with Gradle version (updated to 8.9) and
+JDK version (updated to JBR 17).
+
+https://github.com/owncloud/android/issues/4478
+https://github.com/owncloud/android/pull/4507
diff --git a/gradle.properties b/gradle.properties
index 53ae0ae470e..022f0d32f33 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,6 @@
+android.defaults.buildfeatures.buildconfig=true
 android.enableJetifier=true
+android.nonFinalResIds=false
+android.nonTransitiveRClass=false
 android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536M
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2cf413611ae..841312da68b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-androidGradlePlugin = "7.4.2"
+androidGradlePlugin = "8.7.2"
 androidxActivity = "1.6.1"
 androidxAnnotation = "1.6.0"
 androidxAppCompat = "1.5.1"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8049c684f04..19cfad969ba 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/owncloudApp/build.gradle b/owncloudApp/build.gradle
index faa0df182e1..45cf212a379 100644
--- a/owncloudApp/build.gradle
+++ b/owncloudApp/build.gradle
@@ -104,12 +104,12 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
     sourceSets {
diff --git a/owncloudApp/src/main/java/com/owncloud/android/workers/DownloadFileWorker.kt b/owncloudApp/src/main/java/com/owncloud/android/workers/DownloadFileWorker.kt
index 3d004608257..b8fdb94208d 100644
--- a/owncloudApp/src/main/java/com/owncloud/android/workers/DownloadFileWorker.kt
+++ b/owncloudApp/src/main/java/com/owncloud/android/workers/DownloadFileWorker.kt
@@ -305,7 +305,7 @@ class DownloadFileWorker(
             appContext,
             System.currentTimeMillis().toInt(),
             updateCredentialsIntent,
-            PendingIntent.FLAG_ONE_SHOT
+            PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE
         )
     }
 
@@ -326,7 +326,7 @@ class DownloadFileWorker(
             appContext,
             System.currentTimeMillis().toInt(),
             showDetailsIntent,
-            0
+            PendingIntent.FLAG_IMMUTABLE
         )
     }
 
diff --git a/owncloudComLibrary/build.gradle b/owncloudComLibrary/build.gradle
index 782fd80e411..990895e4ff7 100644
--- a/owncloudComLibrary/build.gradle
+++ b/owncloudComLibrary/build.gradle
@@ -36,6 +36,15 @@ android {
         targetSdkVersion sdkTargetVersion
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
+
     lint {
         abortOnError false
         ignoreWarnings true
diff --git a/owncloudData/build.gradle b/owncloudData/build.gradle
index 1c66b51e8ec..0e62c821d84 100644
--- a/owncloudData/build.gradle
+++ b/owncloudData/build.gradle
@@ -26,13 +26,13 @@ android {
         }
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
     sourceSets {
diff --git a/owncloudDomain/build.gradle b/owncloudDomain/build.gradle
index 4d6b3547408..93d50153250 100644
--- a/owncloudDomain/build.gradle
+++ b/owncloudDomain/build.gradle
@@ -17,13 +17,13 @@ android {
         }
     }
 
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
     sourceSets {
diff --git a/owncloudTestUtil/build.gradle b/owncloudTestUtil/build.gradle
index 3d67e667cec..9e03fd7fc45 100644
--- a/owncloudTestUtil/build.gradle
+++ b/owncloudTestUtil/build.gradle
@@ -9,6 +9,15 @@ android {
         targetSdkVersion sdkTargetVersion
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
+
     buildTypes {
         release {
             minifyEnabled false