diff --git a/app-kotlin/build.gradle b/app-kotlin/build.gradle
index b03df5321..607dfabb3 100644
--- a/app-kotlin/build.gradle
+++ b/app-kotlin/build.gradle
@@ -6,6 +6,7 @@ plugins {
 }
 
 android {
+  namespace "ly.count.android.demo.kotlin"
   compileSdkVersion 35
 
   defaultConfig {
diff --git a/app-kotlin/src/main/AndroidManifest.xml b/app-kotlin/src/main/AndroidManifest.xml
index 55a1d536e..050bfce8a 100644
--- a/app-kotlin/src/main/AndroidManifest.xml
+++ b/app-kotlin/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="ly.count.android.demo.kotlin">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
diff --git a/app-native/build.gradle b/app-native/build.gradle
index d9c97f63e..da6f05d7d 100644
--- a/app-native/build.gradle
+++ b/app-native/build.gradle
@@ -4,6 +4,7 @@ apply plugin: 'com.android.application'
 // apply plugin: ly.count.android.plugins.UploadSymbolsPlugin
 
 android {
+  namespace "ly.count.android.demo.crash"
   compileSdkVersion 35
 
   defaultConfig {
diff --git a/app-native/src/main/AndroidManifest.xml b/app-native/src/main/AndroidManifest.xml
index 2ee131fb8..41a2aecba 100644
--- a/app-native/src/main/AndroidManifest.xml
+++ b/app-native/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ly.count.android.demo.crash">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
   <application
       android:name=".App"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 63643611c..6ca09f3f2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="ly.count.android.demo">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
diff --git a/build.gradle b/build.gradle
index 7035f45e0..b4016bd7f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,10 +10,10 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:7.4.2'
+    classpath 'com.android.tools.build:gradle:8.1.4'
 
     classpath 'com.github.dcendents:android-maven-plugin:1.2'
-    classpath 'com.google.gms:google-services:4.3.15'
+    classpath 'com.google.gms:google-services:4.4.2'
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     classpath 'com.huawei.agconnect:agcp:1.3.1.300'
     classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.5.3"
diff --git a/gradle.properties b/gradle.properties
index f78f3b9a4..315f6a293 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,7 +22,7 @@ org.gradle.configureondemand=true
 android.useAndroidX=true
 android.enableJetifier=true
 # RELEASE FIELD SECTION
-VERSION_NAME=25.4.0
+VERSION_NAME=25.4.1-RC2
 GROUP=ly.count.android
 POM_URL=https://github.com/Countly/countly-sdk-android
 POM_SCM_URL=https://github.com/Countly/countly-sdk-android
@@ -30,8 +30,11 @@ POM_LICENCE_NAME=MIT License
 POM_LICENCE_URL=http://www.opensource.org/licenses/mit-license.php
 POM_LICENCE_DIST=repo
 POM_DEVELOPER_NAME=Countly
-SONATYPE_HOST=DEFAULT
+SONATYPE_HOST=CENTRAL_PORTAL
 RELEASE_SIGNING_ENABLED=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
 #SIGNING SECTION
 signing.keyId=xxx
 signing.password=xxx
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f0fbc8056..694af97a2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Apr 23 22:46:09 EEST 2023
+#Wed May 14 21:37:23 KST 2025
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/sdk-native/build.gradle b/sdk-native/build.gradle
index df51b4dd8..993c8ba57 100644
--- a/sdk-native/build.gradle
+++ b/sdk-native/build.gradle
@@ -6,11 +6,12 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.vanniktech:gradle-maven-publish-plugin:0.21.0' //for publishing
+    classpath 'com.vanniktech:gradle-maven-publish-plugin:0.28.0' //for publishing
   }
 }
 
 android {
+  namespace 'ly.count.android.sdknative'
   compileSdkVersion 35
 
   defaultConfig {
diff --git a/sdk-native/src/main/AndroidManifest.xml b/sdk-native/src/main/AndroidManifest.xml
index cb250c591..064184a82 100644
--- a/sdk-native/src/main/AndroidManifest.xml
+++ b/sdk-native/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ly.count.android.sdknative">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 </manifest>
diff --git a/sdk/build.gradle b/sdk/build.gradle
index 95dc8cda7..8f9b2a812 100644
--- a/sdk/build.gradle
+++ b/sdk/build.gradle
@@ -7,11 +7,12 @@ buildscript {
   }
   dependencies {
     //classpath "com.vanniktech:gradle-android-junit-jacoco-plugin:0.16.0" //test coverage reports
-    classpath 'com.vanniktech:gradle-maven-publish-plugin:0.21.0' //for publishing
+    classpath 'com.vanniktech:gradle-maven-publish-plugin:0.28.0' //for publishing
   }
 }
 
 android {
+  namespace 'ly.count.android.sdk'
   compileSdk 35
   buildToolsVersion "35.0.0"
 
@@ -45,6 +46,7 @@ android {
     timeOutInMs 20 * 60 * 1000 // 20 minutes
     installOptions "-d", "-t"
   }
+  testNamespace 'ly.count.android.sdk.test'
 }
 
 def mockitoVersion = "4.11.0"
diff --git a/sdk/src/androidTest/AndroidManifest.xml b/sdk/src/androidTest/AndroidManifest.xml
index 6d6c61e8a..d79e9e896 100644
--- a/sdk/src/androidTest/AndroidManifest.xml
+++ b/sdk/src/androidTest/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="ly.count.android.sdk">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <application>
     <activity
diff --git a/sdk/src/androidTest/java/ly/count/android/sdk/TestUtils.java b/sdk/src/androidTest/java/ly/count/android/sdk/TestUtils.java
index 59d030627..fa85f2009 100644
--- a/sdk/src/androidTest/java/ly/count/android/sdk/TestUtils.java
+++ b/sdk/src/androidTest/java/ly/count/android/sdk/TestUtils.java
@@ -44,7 +44,7 @@ public class TestUtils {
     public final static String commonAppKey = "appkey";
     public final static String commonDeviceId = "1234";
     public final static String SDK_NAME = "java-native-android";
-    public final static String SDK_VERSION = "25.4.0";
+    public final static String SDK_VERSION = "25.4.1-RC2";
     public static final int MAX_THREAD_COUNT_PER_STACK_TRACE = 50;
 
     public static class Activity2 extends Activity {
diff --git a/sdk/src/main/AndroidManifest.xml b/sdk/src/main/AndroidManifest.xml
index bc4fb5552..ef57e187b 100644
--- a/sdk/src/main/AndroidManifest.xml
+++ b/sdk/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="ly.count.android.sdk">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <application>
     <activity
diff --git a/sdk/src/main/java/ly/count/android/sdk/Countly.java b/sdk/src/main/java/ly/count/android/sdk/Countly.java
index c85f84dd5..51e29aea3 100644
--- a/sdk/src/main/java/ly/count/android/sdk/Countly.java
+++ b/sdk/src/main/java/ly/count/android/sdk/Countly.java
@@ -47,7 +47,7 @@ of this software and associated documentation files (the "Software"), to deal
  */
 public class Countly {
 
-    private final String DEFAULT_COUNTLY_SDK_VERSION_STRING = "25.4.0";
+    private final String DEFAULT_COUNTLY_SDK_VERSION_STRING = "25.4.1-RC2";
 
     /**
      * Used as request meta data on every request
diff --git a/upload-plugin/build.gradle b/upload-plugin/build.gradle
index ae72ea43a..50622a779 100644
--- a/upload-plugin/build.gradle
+++ b/upload-plugin/build.gradle
@@ -3,7 +3,7 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath 'com.vanniktech:gradle-maven-publish-plugin:0.21.0' //for publishing
+    classpath 'com.vanniktech:gradle-maven-publish-plugin:0.28.0' //for publishing
   }
 }