diff --git a/.github/workflows/integration-tests-sentry-cli.yml b/.github/workflows/integration-tests-sentry-cli.yml
index b96b0e251..0e5dba874 100644
--- a/.github/workflows/integration-tests-sentry-cli.yml
+++ b/.github/workflows/integration-tests-sentry-cli.yml
@@ -14,7 +14,11 @@ jobs:
   integration-test:
     runs-on: ubuntu-latest
     env:
+      # sentry-cli 3.6.2+ ignores an auth token when the URL comes from a different
+      # configuration source, so the URL and token must share one source. CLI arguments
+      # and environment variables count as a single runtime source, so both live here.
       SENTRY_URL: http://127.0.0.1:8000
+      SENTRY_AUTH_TOKEN: <token>
     steps:
       - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9d092954..141c7a20d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## Unreleased
+
+### Breaking Changes
+
+- This breaking change is only for customers using self-hosted Sentry together with a user auth token (not an org auth token) and the url and auth token are configured separately:
+  - If so, this breaking change applies to you in order to patch a security flaw. [Please read this](https://github.com/getsentry/sentry-cli/issues/3380#issuecomment-5059013026) for further details.
+
+### Dependencies
+
+- Bump CLI from v3.6.1 to v3.6.2 ([#1373](https://github.com/getsentry/sentry-android-gradle-plugin/pull/1373))
+  - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#362)
+  - [diff](https://github.com/getsentry/sentry-cli/compare/3.6.1...3.6.2)
+
 ## 6.16.0
 
 ### Features
diff --git a/plugin-build/sentry-cli.properties b/plugin-build/sentry-cli.properties
index b107de880..9fa552af5 100644
--- a/plugin-build/sentry-cli.properties
+++ b/plugin-build/sentry-cli.properties
@@ -1,2 +1,2 @@
-version = 3.6.1
+version = 3.6.2
 repo = https://github.com/getsentry/sentry-cli
diff --git a/plugin-build/src/test/kotlin/io/sentry/android/gradle/integration/SentryPluginIntegrationTest.kt b/plugin-build/src/test/kotlin/io/sentry/android/gradle/integration/SentryPluginIntegrationTest.kt
index 878708f78..8d00db4b5 100644
--- a/plugin-build/src/test/kotlin/io/sentry/android/gradle/integration/SentryPluginIntegrationTest.kt
+++ b/plugin-build/src/test/kotlin/io/sentry/android/gradle/integration/SentryPluginIntegrationTest.kt
@@ -37,7 +37,6 @@ class SentryPluginIntegrationTest :
       "Integration test server endpoint is not set",
       System.getenv("SENTRY_URL").isNullOrBlank(),
     )
-    sentryPropertiesFile.appendText("auth.token=<token>")
     applyAutoUploadProguardMapping()
 
     val build = runner.appendArguments(":app:assembleRelease").build()
@@ -54,7 +53,6 @@ class SentryPluginIntegrationTest :
       "Integration test server endpoint is not set",
       System.getenv("SENTRY_URL").isNullOrBlank(),
     )
-    sentryPropertiesFile.appendText("auth.token=<token>")
     applyUploadNativeSymbols()
 
     val build = runner.appendArguments(":app:assembleRelease").build()
@@ -71,7 +69,6 @@ class SentryPluginIntegrationTest :
       "Integration test server endpoint is not set",
       System.getenv("SENTRY_URL").isNullOrBlank(),
     )
-    sentryPropertiesFile.appendText("auth.token=<token>")
     applyUploadSourceContexts()
 
     testProjectDir.withDummyComposeFile()
@@ -93,7 +90,6 @@ class SentryPluginIntegrationTest :
       "Integration test server endpoint is not set",
       System.getenv("SENTRY_URL").isNullOrBlank(),
     )
-    sentryPropertiesFile.appendText("auth.token=<token>")
     applySizeAnalysis()
 
     val build = runner.appendArguments(":app:assembleRelease").build()