diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7da36c3168..506d62ae55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 5.7.0 Release Notes
+# 5.8.0 Release Notes
 
 ## Summary:
 
@@ -6,44 +6,8 @@
 |---|---|
 | **Protocol** | 5.4.1 |
 | **RPC** | 8.0.0 |
-| **Tested Targeting** | Android 34 |
+| **Tested Targeting** | Android 36 |
 
 ## Bug Fix / Enhancements:
 
-- [Add pending intent to ping intents] (https://github.com/smartdevicelink/sdl_java_suite/pull/1844
-
-- [Fixes #1845 typo in SdlBroadcastReceiver for uncaughtException handler](https://github.com/smartdevicelink/sdl_java_suite/pull/1846
-
-- [Bugfix/issue #1842 - NPE in BaseTextAndGraphicsManager](https://github.com/smartdevicelink/sdl_java_suite/pull/1847
-
-- [Fix case for UncaughtExceptionHandler in SdlBroadcastReceiver for RemoteServiceException](https://github.com/smartdevicelink/sdl_java_suite/pull/1849
-
-- [Update gradle to 7.4.2](https://github.com/smartdevicelink/sdl_java_suite/pull/1853
-
-- [Fix NPE in SdlRouterService](https://github.com/smartdevicelink/sdl_java_suite/pull/1870
-
-- [Bugfix/issue 1867 Bluetooth notification error fix](https://github.com/smartdevicelink/sdl_java_suite/pull/1868
-
-- [Clean LifecycleManager before closing](https://github.com/smartdevicelink/sdl_java_suite/pull/1866
-
-- [Move router service message sending to its own thread](https://github.com/smartdevicelink/sdl_java_suite/pull/1871
-
-- [Bugfix/issue 1863 update gradle build variants for hello_sdl](https://github.com/smartdevicelink/sdl_java_suite/pull/1864
-
-- [Android 14 add package to PendingIntents in RouterService](https://github.com/smartdevicelink/sdl_java_suite/pull/1862
-
-- [Android 14 Runtime registered broadcast receivers export behavior](https://github.com/smartdevicelink/sdl_java_suite/pull/1858
-
-- [Add logic to handle RAI response failure](https://github.com/smartdevicelink/sdl_java_suite/pull/1873
-
-- [Android 14 foreground service type required](https://github.com/smartdevicelink/sdl_java_suite/pull/1860
-
-- [Update integration validator with latest permissions and checks for exported](https://github.com/smartdevicelink/sdl_java_suite/pull/1875
-
-- [Fix SDLLockScreenActivityEspressoTest for newer devices](https://github.com/smartdevicelink/sdl_java_suite/pull/1877
-
-- [Remove only app logic for device listener start](https://github.com/smartdevicelink/sdl_java_suite/pull/1879)
-
-- [Fix NPE in TransportBroker](https://github.com/smartdevicelink/sdl_java_suite/pull/1882)
-
-**Full Changelog**: https://github.com/smartdevicelink/sdl_java_suite/compare/5.6.1...RC_5.7.0
\ No newline at end of file
+- [Update to gradle version 8.13 and target API level 36] (https://github.com/smartdevicelink/sdl_java_suite/pull/1886)
diff --git a/VERSION b/VERSION
index 3b867ccd76..edb1d397cf 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.7.0
\ No newline at end of file
+5.8.0
\ No newline at end of file
diff --git a/android/sdl_android/build.gradle b/android/sdl_android/build.gradle
index 8a577fd8bd..c97d231d8b 100644
--- a/android/sdl_android/build.gradle
+++ b/android/sdl_android/build.gradle
@@ -1,10 +1,32 @@
-apply plugin: 'com.android.library'
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+    }
+}
+
+plugins {
+    id "com.android.library"
+    id "com.vanniktech.maven.publish" version "0.35.0"
+}
+
+group = "com.smartdevicelink"
+version = file("../../VERSION").text.trim()
+
+mavenPublishing {
+    publishToMavenCentral()
+    signAllPublications()
+}
 
 android {
     compileSdkVersion 36
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 36
+        versionCode 27
+        versionName new File(projectDir.path, ('/../../VERSION')).text.trim()
         buildConfigField "String", "VERSION_NAME", '\"' + versionName + '\"'
         resValue "string", "SDL_LIB_VERSION", '\"' + versionName + '\"'
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
@@ -65,14 +87,10 @@ dependencies {
     androidTestImplementation 'androidx.test.espresso:espresso-intents:3.7.0'
 }
 
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.34.0'
+afterEvaluate {
+    tasks.named("sourceReleaseJar") {
+        exclude { details ->
+            details.file.toPath().toString().contains("/generated/")
+        }
     }
-}
-
-apply plugin: "com.vanniktech.maven.publish"
+}
\ No newline at end of file
diff --git a/android/sdl_android/gradle.properties b/android/sdl_android/gradle.properties
index d720ac7959..c5a1bdcb4c 100644
--- a/android/sdl_android/gradle.properties
+++ b/android/sdl_android/gradle.properties
@@ -16,15 +16,6 @@ POM_LICENCE_NAME=BSD 3-Clause
 POM_LICENCE_URL=https://opensource.org/licenses/BSD-3-Clause
 POM_LICENCE_DIST=repo
 
-RELEASE_REPOSITORY_URL=https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/
-SNAPSHOT_REPOSITORY_URL=https://s01.oss.sonatype.org/content/repositories/snapshots/
-
 POM_DEVELOPER_ID=
 POM_DEVELOPER_NAME=
 POM_DEVELOPER_URL=
-
-signing.keyId=
-signing.password=
-signing.secretKeyRingFile=
-SONATYPE_NEXUS_USERNAME=
-SONATYPE_NEXUS_PASSWORD=
\ No newline at end of file
diff --git a/javaSE/javaSE/src/main/java/com/smartdevicelink/BuildConfig.java b/javaSE/javaSE/src/main/java/com/smartdevicelink/BuildConfig.java
index 50d96116e8..0fe321265c 100644
--- a/javaSE/javaSE/src/main/java/com/smartdevicelink/BuildConfig.java
+++ b/javaSE/javaSE/src/main/java/com/smartdevicelink/BuildConfig.java
@@ -32,5 +32,5 @@
 
 // THIS FILE IS AUTO GENERATED, DO NOT MODIFY!!
 public final class BuildConfig {
-    public static final String VERSION_NAME = "5.7.0";
+    public static final String VERSION_NAME = "5.8.0";
 }
\ No newline at end of file