diff --git a/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java b/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java
index fbbd9a55..581d2f2b 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/OpenScale.java
@@ -344,7 +344,8 @@ public class OpenScale {
                 runUiToastMsg(infoText);
             }
 
-            syncInsertMeasurement(scaleMeasurement);
+            syncInsertMeasurement(scaleMeasurement, "com.health.openscale.sync");
+            syncInsertMeasurement(scaleMeasurement, "com.health.openscale.sync.oss");
             alarmHandler.entryChanged(context, scaleMeasurement);
             triggerWidgetUpdate();
         } else {
@@ -415,13 +416,16 @@ public class OpenScale {
         Timber.d("Update measurement: %s", scaleMeasurement);
         measurementDAO.update(scaleMeasurement);
         alarmHandler.entryChanged(context, scaleMeasurement);
-        syncUpdateMeasurement(scaleMeasurement);
+        syncUpdateMeasurement(scaleMeasurement, "com.health.openscale.sync");
+        syncUpdateMeasurement(scaleMeasurement, "com.health.openscale.sync.oss");
 
         triggerWidgetUpdate();
     }
 
     public void deleteScaleMeasurement(int id) {
-        syncDeleteMeasurement(measurementDAO.get(id).getDateTime());
+        syncDeleteMeasurement(measurementDAO.get(id).getDateTime(), "com.health.openscale.sync");
+        syncDeleteMeasurement(measurementDAO.get(id).getDateTime(), "com.health.openscale.sync.oss");
+
         measurementDAO.delete(id);
     }
 
@@ -552,7 +556,9 @@ public class OpenScale {
     public void clearScaleMeasurements(int userId) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         prefs.edit().putInt("uniqueNumber", 0x00).apply();
-        syncClearMeasurements();
+        syncClearMeasurements("com.health.openscale.sync");
+        syncClearMeasurements("com.health.openscale.sync.oss");
+
         measurementDAO.deleteAll(userId);
     }
 
@@ -717,9 +723,9 @@ public class OpenScale {
         });
     }
 
-    private void syncInsertMeasurement(ScaleMeasurement scaleMeasurement) {
+    private void syncInsertMeasurement(ScaleMeasurement scaleMeasurement, String pkgName) {
         Intent intent = new Intent();
-        intent.setComponent(new ComponentName("com.health.openscale.sync", "com.health.openscale.sync.core.service.SyncService"));
+        intent.setComponent(new ComponentName(pkgName, pkgName + ".core.service.SyncService"));
         intent.putExtra("mode", "insert");
         intent.putExtra("userId", scaleMeasurement.getUserId());
         intent.putExtra("weight", scaleMeasurement.getWeight());
@@ -730,9 +736,9 @@ public class OpenScale {
         ContextCompat.startForegroundService(context, intent);
     }
 
-    private void syncUpdateMeasurement(ScaleMeasurement scaleMeasurement) {
+    private void syncUpdateMeasurement(ScaleMeasurement scaleMeasurement, String pkgName) {
         Intent intent = new Intent();
-        intent.setComponent(new ComponentName("com.health.openscale.sync", "com.health.openscale.sync.core.service.SyncService"));
+        intent.setComponent(new ComponentName(pkgName, pkgName + ".core.service.SyncService"));
         intent.putExtra("mode", "update");
         intent.putExtra("userId", scaleMeasurement.getUserId());
         intent.putExtra("weight", scaleMeasurement.getWeight());
@@ -743,17 +749,17 @@ public class OpenScale {
         ContextCompat.startForegroundService(context, intent);
     }
 
-    private void syncDeleteMeasurement(Date date) {
+    private void syncDeleteMeasurement(Date date, String pkgName) {
         Intent intent = new Intent();
-        intent.setComponent(new ComponentName("com.health.openscale.sync", "com.health.openscale.sync.core.service.SyncService"));
+        intent.setComponent(new ComponentName(pkgName, pkgName + ".core.service.SyncService"));
         intent.putExtra("mode", "delete");
         intent.putExtra("date", date.getTime());
         ContextCompat.startForegroundService(context, intent);
     }
 
-    private void syncClearMeasurements() {
+    private void syncClearMeasurements(String pkgName) {
         Intent intent = new Intent();
-        intent.setComponent(new ComponentName("com.health.openscale.sync", "com.health.openscale.sync.core.service.SyncService"));
+        intent.setComponent(new ComponentName(pkgName, pkgName + ".core.service.SyncService"));
         intent.putExtra("mode", "clear");
         ContextCompat.startForegroundService(context, intent);
     }
diff --git a/android_app/build.gradle b/android_app/build.gradle
index b2e93c7b..e1f8626d 100644
--- a/android_app/build.gradle
+++ b/android_app/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.2'
+        classpath 'com.android.tools.build:gradle:8.9.1'
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.4"
     }
 }
diff --git a/android_app/gradle/wrapper/gradle-wrapper.properties b/android_app/gradle/wrapper/gradle-wrapper.properties
index 924bebdb..d1130dea 100644
--- a/android_app/gradle/wrapper/gradle-wrapper.properties
+++ b/android_app/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip