diff --git a/metadata/com.fr3ts0n.androbd.plugin.mqtt.txt b/metadata/com.fr3ts0n.androbd.plugin.mqtt.txt
new file mode 100644
index 0000000000..8077a47d37
--- /dev/null
+++ b/metadata/com.fr3ts0n.androbd.plugin.mqtt.txt
@@ -0,0 +1,22 @@
+Categories:Connectivity
+License:GPL-3.0+
+Web Site:https://github.com/fr3ts0n/AndrOBD-Plugin/wiki
+Source Code:https://github.com/fr3ts0n/AndrOBD-Plugin
+Issue Tracker:https://github.com/fr3ts0n/AndrOBD-Plugin/issues
+Changelog:https://github.com/fr3ts0n/AndrOBD-Plugin/releases
+Bitcoin:19UApzsc5eDJ5VNDNYCA1bpszPnkcpWeFP
+
+Auto Name:MqttPublisher Plugin
+
+Repo Type:git
+Repo:https://github.com/fr3ts0n/AndrOBD-Plugin
+
+Build:V1.0.0,10000
+    commit=V1.0.0
+    subdir=MqttPublisher
+    gradle=yes
+
+Auto Update Mode:Version %v
+Update Check Mode:Tags
+Current Version:V1.0.0
+Current Version Code:10000
diff --git a/metadata/com.fr3ts0n.ecu.gui.androbd.txt b/metadata/com.fr3ts0n.ecu.gui.androbd.txt
index 9579d074a3..1365b40e80 100644
--- a/metadata/com.fr3ts0n.ecu.gui.androbd.txt
+++ b/metadata/com.fr3ts0n.ecu.gui.androbd.txt
@@ -4,7 +4,7 @@ Web Site:https://github.com/fr3ts0n/AndrOBD/wiki
 Source Code:https://github.com/fr3ts0n/AndrOBD
 Issue Tracker:https://github.com/fr3ts0n/AndrOBD/issues
 Changelog:https://github.com/fr3ts0n/AndrOBD/releases
-Bitcoin:12xyTZnMMDaKMcHaeseXPd8e4NNbMFF8rt
+Bitcoin:19UApzsc5eDJ5VNDNYCA1bpszPnkcpWeFP
 
 Auto Name:AndrOBD
 Summary:Connect to your car's OBD system
@@ -588,30 +588,18 @@ Build:V1.5.5,10505
         cp -fR $$UsbSerial4Android$$/usbSerialForAndroid/src/main/java/com src/ && \
         cp $$AChartEngineFr3ts0n$$/target/achartengine-1.2.0.jar libs/
 
-Build:V2.0.0,20000
-    commit=V2.0.0
-    srclibs=AChartEngineFr3ts0n@e2594a4a257cfeacba3595f1b16218a5541810c3,UsbSerial4Android@a213f06ad0b19fd6f1a6b4f8b2f74f986a00ea68
-    rm=libs/*.jar,src/com/fr3ts0n/pvs/gui/,src/com/fr3ts0n/ecu/gui/application/,src/com/fr3ts0n/prot/gui/
-    build=pushd $$AChartEngineFr3ts0n$$ && \
-        $$MVN3$$ package && \
-        popd && \
-        cp -fR $$UsbSerial4Android$$/usbSerialForAndroid/src/main/java/com src/ && \
-        cp $$AChartEngineFr3ts0n$$/target/achartengine-1.2.0.jar libs/
-
 Build:V2.0.1,20001
     commit=V2.0.1
+    subdir=androbd
+    gradle=yes
     srclibs=AChartEngineFr3ts0n@e2594a4a257cfeacba3595f1b16218a5541810c3,UsbSerial4Android@a213f06ad0b19fd6f1a6b4f8b2f74f986a00ea68
-    rm=libs/*.jar,src/com/fr3ts0n/pvs/gui/,src/com/fr3ts0n/ecu/gui/application/,src/com/fr3ts0n/prot/gui/
+    rm=androbd/libs/*.jar
     build=pushd $$AChartEngineFr3ts0n$$ && \
         $$MVN3$$ package && \
         popd && \
-        cp -fR $$UsbSerial4Android$$/usbSerialForAndroid/src/main/java/com src/ && \
+        cp -fR $$UsbSerial4Android$$/usbSerialForAndroid/src/main/java/com src/main/java/ && \
         cp $$AChartEngineFr3ts0n$$/target/achartengine-1.2.0.jar libs/
 
-Maintainer Notes:
-Very unstable and complex build, do not enable auto updates.
-.
-
 Auto Update Mode:Version %v
 Update Check Mode:Tags
 Current Version:V2.0.1