diff --git a/android_app/app/src/main/AndroidManifest.xml b/android_app/app/src/main/AndroidManifest.xml
index 96d07d99..a15e8101 100644
--- a/android_app/app/src/main/AndroidManifest.xml
+++ b/android_app/app/src/main/AndroidManifest.xml
@@ -22,6 +22,11 @@
 
     <uses-feature android:name="android.hardware.bluetooth_le" android:required="false"/>
 
+    <queries>
+        <package android:name="com.health.openscale.sync.oss" />
+        <package android:name="com.health.openscale.sync" />
+    </queries>
+
     <application
         android:allowBackup="true"
         android:requestLegacyExternalStorage="true"
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 581d2f2b..6e80138e 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
@@ -725,7 +725,7 @@ public class OpenScale {
 
     private void syncInsertMeasurement(ScaleMeasurement scaleMeasurement, String pkgName) {
         Intent intent = new Intent();
-        intent.setComponent(new ComponentName(pkgName, pkgName + ".core.service.SyncService"));
+        intent.setComponent(new ComponentName(pkgName, "com.health.openscale.sync.core.service.SyncService"));
         intent.putExtra("mode", "insert");
         intent.putExtra("userId", scaleMeasurement.getUserId());
         intent.putExtra("weight", scaleMeasurement.getWeight());
@@ -738,7 +738,7 @@ public class OpenScale {
 
     private void syncUpdateMeasurement(ScaleMeasurement scaleMeasurement, String pkgName) {
         Intent intent = new Intent();
-        intent.setComponent(new ComponentName(pkgName, pkgName + ".core.service.SyncService"));
+        intent.setComponent(new ComponentName(pkgName, "com.health.openscale.sync.core.service.SyncService"));
         intent.putExtra("mode", "update");
         intent.putExtra("userId", scaleMeasurement.getUserId());
         intent.putExtra("weight", scaleMeasurement.getWeight());
@@ -751,7 +751,7 @@ public class OpenScale {
 
     private void syncDeleteMeasurement(Date date, String pkgName) {
         Intent intent = new Intent();
-        intent.setComponent(new ComponentName(pkgName, pkgName + ".core.service.SyncService"));
+        intent.setComponent(new ComponentName(pkgName, "com.health.openscale.sync.core.service.SyncService"));
         intent.putExtra("mode", "delete");
         intent.putExtra("date", date.getTime());
         ContextCompat.startForegroundService(context, intent);
@@ -759,7 +759,7 @@ public class OpenScale {
 
     private void syncClearMeasurements(String pkgName) {
         Intent intent = new Intent();
-        intent.setComponent(new ComponentName(pkgName, pkgName + ".core.service.SyncService"));
+        intent.setComponent(new ComponentName(pkgName, "com.health.openscale.sync.core.service.SyncService"));
         intent.putExtra("mode", "clear");
         ContextCompat.startForegroundService(context, intent);
     }