diff --git a/app/build.gradle b/app/build.gradle
index b395fa882..a93f755e0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ def firebaseEnabled() {
 }
 
 def isLocalAarAvailable() {
-    File debugAar = new File('linphone-sdk/build/linphone-sdk/bin/outputs/aar/linphone-sdk-android-debug.aar')
-    File releaseAar = new File('linphone-sdk/build/linphone-sdk/bin/outputs/aar/linphone-sdk-android-release.aar')
+    File debugAar = new File('linphone-sdk-android/linphone-sdk-android-debug.aar')
+    File releaseAar = new File('linphone-sdk-android/linphone-sdk-android-release.aar')
     return debugAar.exists() || releaseAar.exists()
 }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 032c044ee..d3c222e7e 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -92,7 +92,7 @@
                 <data android:scheme="imto"/>
             </intent-filter>
             <intent-filter>
-                <data android:mimeType="@string/sync_mimetype"/> <!-- Change package in res/values/non_localizable_custom.xml ! -->
+                <data android:mimeType="@string/sync_mimetype"/>
                 <action android:name="android.intent.action.VIEW"/>
 
                 <category android:name="android.intent.category.BROWSABLE"/>
@@ -283,7 +283,7 @@
 
         <provider
             android:name="android.support.v4.content.FileProvider"
-            android:authorities="org.linphone.provider"
+            android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true">
             <meta-data
diff --git a/app/src/main/res/values/non_localizable_custom.xml b/app/src/main/res/values/non_localizable_custom.xml
index 5597c481f..ee97d624f 100644
--- a/app/src/main/res/values/non_localizable_custom.xml
+++ b/app/src/main/res/values/non_localizable_custom.xml
@@ -5,8 +5,8 @@
     <string name="default_domain">sip.linphone.org</string><!-- Set the default domain used for account creation/addresses -->
     <string name="default_conference_factory_uri">sip:conference-factory@sip.linphone.org</string>
     <string name="file_provider">org.linphone.provider</string>
-    <string name="sync_account_type">org.linphone</string> <!-- Change package ! -->
-    <string name="sync_mimetype">vnd.android.cursor.item/org.linphone.profile</string> <!-- Change package, leave .profile at the end. Also change res/xml/contacts.xml ! -->
+    <string name="sync_account_type">${applicationId}</string>
+    <string name="sync_mimetype">vnd.android.cursor.item/${applicationId}.profile</string>
     <string name="rls_uri">sip:rls@sip.linphone.org</string>
     <string name="user_agent">LinphoneAndroid</string>
     <bool name="orientation_portrait_only">false</bool>
diff --git a/app/src/main/res/xml/contacts.xml b/app/src/main/res/xml/contacts.xml
index db84bc8c9..df002a27c 100644
--- a/app/src/main/res/xml/contacts.xml
+++ b/app/src/main/res/xml/contacts.xml
@@ -3,9 +3,8 @@
 <ContactsSource
         xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!-- Change package, leave vnd.android.cursor.item/ before and .profile at the end. -->
     <ContactsDataKind
-        android:mimeType="vnd.android.cursor.item/org.linphone.profile"
+        android:mimeType="vnd.android.cursor.item/${applicationId}.profile"
         android:icon="@drawable/linphone_logo"
         android:summaryColumn="data2"
         android:detailColumn="data3"
diff --git a/app/src/main/res/xml/syncadapter.xml b/app/src/main/res/xml/syncadapter.xml
index a4021be08..172f5795d 100644
--- a/app/src/main/res/xml/syncadapter.xml
+++ b/app/src/main/res/xml/syncadapter.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<!-- Change package ! -->
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
       android:contentAuthority="com.android.contacts"
-      android:accountType="org.linphone"
+      android:accountType="${applicationId}"
       android:supportsUploading="false"
       android:userVisible="false"/>
diff --git a/linphone-sdk-android/build.gradle b/linphone-sdk-android/build.gradle
index 65b9df6ef..b7dbd9ddf 100644
--- a/linphone-sdk-android/build.gradle
+++ b/linphone-sdk-android/build.gradle
@@ -1,2 +1,11 @@
 configurations.maybeCreate("default")
-artifacts.add("default", file('linphone-sdk-android-debug.aar'))
\ No newline at end of file
+
+File debugAar = new File('linphone-sdk-android/linphone-sdk-android-debug.aar')
+File releaseAar = new File('linphone-sdk-android/linphone-sdk-android-release.aar')
+
+if (debugAar.exists()) {
+    artifacts.add("default", file('linphone-sdk-android-debug.aar'))
+}
+if (releaseAar.exists()) {
+    artifacts.add("default", file('linphone-sdk-android-release.aar'))
+}
\ No newline at end of file
diff --git a/linphone-sdk-android/linphone-sdk-android-debug.aar b/linphone-sdk-android/linphone-sdk-android-debug.aar
deleted file mode 100644
index da7a561c9..000000000
Binary files a/linphone-sdk-android/linphone-sdk-android-debug.aar and /dev/null differ
diff --git a/linphone-sdk-android/linphone-sdk-android-debug.aar b/linphone-sdk-android/linphone-sdk-android-debug.aar
new file mode 120000
index 000000000..081daac78
--- /dev/null
+++ b/linphone-sdk-android/linphone-sdk-android-debug.aar
@@ -0,0 +1 @@
+../linphone-sdk/build/linphone-sdk/bin/outputs/aar/linphone-sdk-android-debug.aar
\ No newline at end of file
diff --git a/linphone-sdk-android/linphone-sdk-android-release.aar b/linphone-sdk-android/linphone-sdk-android-release.aar
new file mode 120000
index 000000000..5ae44e9e0
--- /dev/null
+++ b/linphone-sdk-android/linphone-sdk-android-release.aar
@@ -0,0 +1 @@
+../linphone-sdk/build/linphone-sdk/bin/outputs/aar/linphone-sdk-android-release.aar
\ No newline at end of file