diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 29b3bb2..6d4756b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -29,10 +29,10 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
 
-      - name: Setup Gradle 8.7
+      - name: Setup Gradle 8.13
         uses: gradle/actions/setup-gradle@v3
         with:
-          gradle-version: '8.7'
+          gradle-version: '8.13'
           cache-read-only: false
 
       - name: Write local.properties
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index c67e615..a5586f7 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -39,10 +39,10 @@ jobs:
           java-version: "17"
           distribution: temurin
 
-      - name: Setup Gradle 8.7
+      - name: Setup Gradle 8.13
         uses: gradle/actions/setup-gradle@v3
         with:
-          gradle-version: "8.7"
+          gradle-version: "8.13"
           cache-read-only: false
 
       - name: Write local.properties
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d03761..b8971f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,10 @@ Rules:
 - Merge conflicts must preserve both sides; if both branches used the same version string, renumber the lower-priority one upward
 
 ---
+## [0.22.2-beta.1] - 2026-06-02
+
+### Changed
+- Upgraded Android Gradle Plugin from 8.4.0 to 8.13.2 and Gradle wrapper from 8.6 to 8.11.1.
 
 ## [0.22.1-beta.1] - 2026-06-02
 
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index a867d8b..f12fa02 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -13,8 +13,8 @@ android {
         applicationId = "com.mapgie.goflo"
         minSdk = 26
         targetSdk = 34
-        versionCode = 58
-        versionName = "0.22.1-beta.1"
+        versionCode = 59
+        versionName = "0.22.2-beta.1"
     }
 
     signingConfigs {
diff --git a/app/src/main/java/com/mapgie/goflo/ui/screens/licenses/LicensesScreen.kt b/app/src/main/java/com/mapgie/goflo/ui/screens/licenses/LicensesScreen.kt
index afcfee9..4f1070f 100644
--- a/app/src/main/java/com/mapgie/goflo/ui/screens/licenses/LicensesScreen.kt
+++ b/app/src/main/java/com/mapgie/goflo/ui/screens/licenses/LicensesScreen.kt
@@ -3,6 +3,7 @@ package com.mapgie.goflo.ui.screens.licenses
 // MAINTAINER NOTE: keep this list in sync with gradle/libs.versions.toml.
 // Add an entry here whenever a new RUNTIME dependency is added to the project.
 // Compose library versions are pinned via the Compose BOM (currently 2025.05.01).
+// Last verified against libs.versions.toml: AGP 8.13.2 upgrade (no library additions or removals).
 //
 // Excluded — not shipped in the release APK:
 //   junit                    (testImplementation only)
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 2c6e52b..d0b12c5 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.6.0"
+agp = "8.13.2"
 kotlin = "2.0.0"
 ksp = "2.0.0-1.0.21"
 coreKtx = "1.13.1"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e7646de..37f853b 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME