diff --git a/updates.xml b/updates.xml
index b6e81721..45d984e1 100644
--- a/updates.xml
+++ b/updates.xml
@@ -7,80 +7,32 @@
 <updates>
   <update>
     <name>MokoWaaS</name>
-    <description>MokoWaaS update</description>
-    <element>mokowaas</element>
-    <type>package</type>
-    <version>02.05.00-dev</version>
-    <tags><tag>development</tag></tags>
-    <infourl title="MokoWaaS">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development</infourl>
-    <downloads>
-      <downloadurl type="full" format="zip">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02/pkg_mokowaas-02.05.00.zip</downloadurl>
-    </downloads>
-    <sha256>eda0f7ece00ed66c60a06d7b7bcdaf6326f86d4fad8cb56939bb377af618f0a1</sha256>
-    <targetplatform name="joomla" version="(5|6)\..*" />
-    <maintainer>Moko Consulting</maintainer>
-    <maintainerurl>https://mokoconsulting.tech</maintainerurl>
-  </update>
-  <update>
-    <name>MokoWaaS</name>
-    <description>MokoWaaS update</description>
-    <element>mokowaas</element>
-    <type>package</type>
-    <version>02.05.00-alpha</version>
-    <tags><tag>alpha</tag></tags>
-    <infourl title="MokoWaaS">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/alpha</infourl>
-    <downloads>
-      <downloadurl type="full" format="zip">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02/pkg_mokowaas-02.05.00.zip</downloadurl>
-    </downloads>
-    <sha256>eda0f7ece00ed66c60a06d7b7bcdaf6326f86d4fad8cb56939bb377af618f0a1</sha256>
-    <targetplatform name="joomla" version="(5|6)\..*" />
-    <maintainer>Moko Consulting</maintainer>
-    <maintainerurl>https://mokoconsulting.tech</maintainerurl>
-  </update>
-  <update>
-    <name>MokoWaaS</name>
-    <description>MokoWaaS update</description>
-    <element>mokowaas</element>
-    <type>package</type>
-    <version>02.05.00-beta</version>
-    <tags><tag>beta</tag></tags>
-    <infourl title="MokoWaaS">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/beta</infourl>
-    <downloads>
-      <downloadurl type="full" format="zip">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02/pkg_mokowaas-02.05.00.zip</downloadurl>
-    </downloads>
-    <sha256>eda0f7ece00ed66c60a06d7b7bcdaf6326f86d4fad8cb56939bb377af618f0a1</sha256>
-    <targetplatform name="joomla" version="(5|6)\..*" />
-    <maintainer>Moko Consulting</maintainer>
-    <maintainerurl>https://mokoconsulting.tech</maintainerurl>
-  </update>
-  <update>
-    <name>MokoWaaS</name>
-    <description>MokoWaaS update</description>
-    <element>mokowaas</element>
-    <type>package</type>
-    <version>02.05.00-rc</version>
-    <tags><tag>rc</tag></tags>
-    <infourl title="MokoWaaS">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/rc</infourl>
-    <downloads>
-      <downloadurl type="full" format="zip">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02/pkg_mokowaas-02.05.00.zip</downloadurl>
-    </downloads>
-    <sha256>eda0f7ece00ed66c60a06d7b7bcdaf6326f86d4fad8cb56939bb377af618f0a1</sha256>
-    <targetplatform name="joomla" version="(5|6)\..*" />
-    <maintainer>Moko Consulting</maintainer>
-    <maintainerurl>https://mokoconsulting.tech</maintainerurl>
-  </update>
-  <update>
-    <name>MokoWaaS</name>
-    <description>MokoWaaS update</description>
-    <element>mokowaas</element>
+    <description>MokoWaaS stable update</description>
+    <element>pkg_mokowaas</element>
     <type>package</type>
     <version>02.05.00</version>
     <tags><tag>stable</tag></tags>
-    <infourl title="MokoWaaS">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/stable</infourl>
+    <infourl title="MokoWaaS">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/v02</infourl>
+    <downloads>
+      <downloadurl type="full" format="zip">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02/pkg_mokowaas-02.05.00.zip</downloadurl>
+    </downloads>
+    <targetplatform name="joomla" version="(5|6)\..*" />
+    <maintainer>Moko Consulting</maintainer>
+    <maintainerurl>https://mokoconsulting.tech</maintainerurl>
+  </update>
+  <update>
+    <name>System - MokoWaaS</name>
+    <description>MokoWaaS stable update (legacy plugin upgrade)</description>
+    <element>mokowaas</element>
+    <type>plugin</type>
+    <folder>system</folder>
+    <client>site</client>
+    <version>02.05.00</version>
+    <tags><tag>stable</tag></tags>
+    <infourl title="MokoWaaS">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/v02</infourl>
     <downloads>
       <downloadurl type="full" format="zip">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02/pkg_mokowaas-02.05.00.zip</downloadurl>
     </downloads>
-    <sha256>eda0f7ece00ed66c60a06d7b7bcdaf6326f86d4fad8cb56939bb377af618f0a1</sha256>
     <targetplatform name="joomla" version="(5|6)\..*" />
     <maintainer>Moko Consulting</maintainer>
     <maintainerurl>https://mokoconsulting.tech</maintainerurl>