diff --git a/gradle.properties b/gradle.properties
index b3c59b61a..340955593 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-version=25.8.1
+version=25.8.2
 group=oap
 
 oap.java-convention.version=25.2.0
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 7a88c26c5..29faa9a02 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -5,16 +5,38 @@ pluginManagement {
         id("oap.java-convention") version providers.gradleProperty("oap.java-convention.version").get()
     }
     repositories {
-        maven { url = uri(providers.gradleProperty("altRepositoryUri")
-            .getOrElse("https://maven.xenoss.net/repository/oap-maven/")) }
+        maven {
+            url = uri(providers.gradleProperty("altRepositoryUri")
+                .getOrElse("https://maven.xenoss.net/repository/oap-maven/"))
+            val oapUsername = providers.gradleProperty("oap.repository.user").orNull
+            val oapPassword = providers.gradleProperty("oap.repository.password").orNull
+                ?: System.getenv("CODEARTIFACT_AUTH_TOKEN")
+            if (oapUsername != null && oapPassword != null) {
+                credentials {
+                    username = oapUsername
+                    password = oapPassword
+                }
+            }
+        }
         gradlePluginPortal()
     }
 }
 
 dependencyResolutionManagement {
     repositories {
-        maven { url = uri(providers.gradleProperty("altRepositoryUri")
-            .getOrElse("https://maven.xenoss.net/repository/oap-maven/")) }
+        maven {
+            url = uri(providers.gradleProperty("altRepositoryUri")
+                .getOrElse("https://maven.xenoss.net/repository/oap-maven/"))
+            val oapUsername = providers.gradleProperty("oap.repository.user").orNull
+            val oapPassword = providers.gradleProperty("oap.repository.password").orNull
+                ?: System.getenv("CODEARTIFACT_AUTH_TOKEN")
+            if (oapUsername != null && oapPassword != null) {
+                credentials {
+                    username = oapUsername
+                    password = oapPassword
+                }
+            }
+        }
         mavenCentral()
     }
 }