diff --git a/metadata/org.flyve.inventory.agent.yml b/metadata/org.flyve.inventory.agent.yml
index 0826b3fa07..4f5916b7e1 100644
--- a/metadata/org.flyve.inventory.agent.yml
+++ b/metadata/org.flyve.inventory.agent.yml
@@ -10,6 +10,10 @@ Changelog: https://github.com/flyve-mdm/android-inventory-agent/raw/HEAD/CHANGEL
 
 AutoName: Inventory
 Description: |-
+    <b>Note</b>: The app id was changed. Please use
+    <a href="https://f-droid.org/en/packages/org.flyve.inventory.agent/">org.glpi.inventory.agent</a>
+    instead.
+
     This application is the Android inventory agent of the Inventory project.
 
     It features a complete inventory of your Android devices: both hardware and
@@ -46,18 +50,7 @@ Builds:
     prebuild: sed -i -e 's/android:versionName=\"/android:versionName=\"$$VERSION$$/'
         src/main/AndroidManifest.xml
 
-  - versionName: 1.0.0
-    versionCode: 39263
-    disable: firebase crashlytics https://github.com/glpi-project/android-inventory-agent/issues/344
-    commit: 1.0.0
-    subdir: app
-    gradle:
-      - yes
-    prebuild: sed -i -e 's/android:versionName=\"/android:versionName=\"$$VERSION$$/'
-        src/main/AndroidManifest.xml
-
 AutoUpdateMode: None
-UpdateCheckMode: Tags
-UpdateCheckData: app/src/main/AndroidManifest.xml|android:versionCode="(\d+)"||
-CurrentVersion: 1.2.0
-CurrentVersionCode: 39351
+UpdateCheckMode: None
+CurrentVersion: 1.0.0-rc.1
+CurrentVersionCode: 39160
diff --git a/metadata/org.glpi.inventory.agent.yml b/metadata/org.glpi.inventory.agent.yml
new file mode 100644
index 0000000000..19f90607e8
--- /dev/null
+++ b/metadata/org.glpi.inventory.agent.yml
@@ -0,0 +1,39 @@
+Categories:
+  - System
+License: GPL-3.0-only
+AuthorName: GLPI Project
+AuthorEmail: glpi@teclib.com
+SourceCode: https://github.com/glpi-project/android-inventory-agent
+Changelog: https://github.com/glpi-project/android-inventory-agent/blob/HEAD/CHANGELOG.md
+
+AutoName: GLPI Agent
+Description: |-
+    The Inventory Agent for Android is part of GLPI Android Inventory Agent project.
+    It allows you to collect a complete inventory of your Android device and sent it
+    to your management software.
+
+RepoType: git
+Repo: https://github.com/glpi-project/android-inventory-agent.git
+
+Builds:
+  - versionName: 1.2.0
+    versionCode: 39351
+    commit: be37e39dddeb8bd0de2527ca088eeb01779dc04d
+    subdir: app
+    gradle:
+      - yes
+    rm:
+      - app/libs/*.aar
+    prebuild:
+      - sed -i -e '/firebase/d' -e '/gms/d' build.gradle ../build.gradle
+      - sed -i -e '/dependencies {/a implementation "com.github.flyve-mdm:android-inventory-library:5d28aee9bc@aar"'
+        build.gradle
+      - sed -i -e 's|maven.fabric.io/public|jitpack.io|' -e '/repositories {/a maven{
+        url "https://jitpack.io" }' ../build.gradle
+      - sed -i -e 's/android:versionName=\"/android:versionName=\"$$VERSION$$/' src/main/AndroidManifest.xml
+
+AutoUpdateMode: Version
+UpdateCheckMode: Tags
+UpdateCheckData: app/src/main/AndroidManifest.xml|android:versionCode="(\d+)"||
+CurrentVersion: 1.2.0
+CurrentVersionCode: 39351
diff --git a/metadata/org.glpi.inventory.agent/en-US/summary.txt b/metadata/org.glpi.inventory.agent/en-US/summary.txt
new file mode 100644
index 0000000000..6bdd8737c3
--- /dev/null
+++ b/metadata/org.glpi.inventory.agent/en-US/summary.txt
@@ -0,0 +1 @@
+GLPI Android Inventory Agent