diff --git a/updates.xml b/updates.xml
index eb26ddd8..d91b549a 100644
--- a/updates.xml
+++ b/updates.xml
@@ -1,114 +1,88 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
- SPDX-License-Identifier: GPL-3.0-or-later
- VERSION: 02.01.14
- -->
-
+<?xml version="1.0" encoding="utf-8"?>
 <updates>
-
   <update>
     <name>System - MokoWaaS</name>
-    <description>MokoWaaS system plugin — development build.</description>
-    <element>mokowaas</element>
+    <description>System - MokoWaaS update</description>
+    <element>system-mokowaas</element>
     <type>plugin</type>
-    <folder>system</folder>
-    <client>site</client>
     <version>02.01.14</version>
-    <creationDate>2026-04-21</creationDate>
-    <infourl title='MokoWaaS'>https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases</infourl>
-    <downloads>
-      <downloadurl type='full' format='zip'>https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02/mokowaas-02.01.14.zip</downloadurl>
-    </downloads>
-    <sha256></sha256>
+    <client>site</client>
+    <folder>system</folder>
     <tags><tag>development</tag></tags>
+    <infourl title="System - MokoWaaS">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/v02.01.14</infourl>
+    <downloads>
+      <downloadurl type="full" format="zip">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02.01.14/system-mokowaas-02.01.14.zip</downloadurl>
+    </downloads>
+    <targetplatform name="joomla" version="((5.[0-9])|(6.[0-9]))" />
     <maintainer>Moko Consulting</maintainer>
     <maintainerurl>https://mokoconsulting.tech</maintainerurl>
-    <targetplatform name='joomla' version='(5|6).*'/>
-    <php_minimum>8.1</php_minimum>
   </update>
-
   <update>
     <name>System - MokoWaaS</name>
-    <description>MokoWaaS system plugin — alpha build.</description>
-    <element>mokowaas</element>
+    <description>System - MokoWaaS update</description>
+    <element>system-mokowaas</element>
     <type>plugin</type>
-    <folder>system</folder>
-    <client>site</client>
     <version>02.01.14</version>
-    <creationDate>2026-04-21</creationDate>
-    <infourl title='MokoWaaS'>https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases</infourl>
-    <downloads>
-      <downloadurl type='full' format='zip'>https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02/mokowaas-02.01.14.zip</downloadurl>
-    </downloads>
-    <sha256></sha256>
+    <client>site</client>
+    <folder>system</folder>
     <tags><tag>alpha</tag></tags>
+    <infourl title="System - MokoWaaS">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/v02.01.14</infourl>
+    <downloads>
+      <downloadurl type="full" format="zip">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02.01.14/system-mokowaas-02.01.14.zip</downloadurl>
+    </downloads>
+    <targetplatform name="joomla" version="((5.[0-9])|(6.[0-9]))" />
     <maintainer>Moko Consulting</maintainer>
     <maintainerurl>https://mokoconsulting.tech</maintainerurl>
-    <targetplatform name='joomla' version='(5|6).*'/>
-    <php_minimum>8.1</php_minimum>
   </update>
-
   <update>
     <name>System - MokoWaaS</name>
-    <description>MokoWaaS system plugin — beta build.</description>
-    <element>mokowaas</element>
+    <description>System - MokoWaaS update</description>
+    <element>system-mokowaas</element>
     <type>plugin</type>
-    <folder>system</folder>
-    <client>site</client>
     <version>02.01.14</version>
-    <creationDate>2026-04-21</creationDate>
-    <infourl title='MokoWaaS'>https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases</infourl>
-    <downloads>
-      <downloadurl type='full' format='zip'>https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02/mokowaas-02.01.14.zip</downloadurl>
-    </downloads>
-    <sha256></sha256>
+    <client>site</client>
+    <folder>system</folder>
     <tags><tag>beta</tag></tags>
+    <infourl title="System - MokoWaaS">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/v02.01.14</infourl>
+    <downloads>
+      <downloadurl type="full" format="zip">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02.01.14/system-mokowaas-02.01.14.zip</downloadurl>
+    </downloads>
+    <targetplatform name="joomla" version="((5.[0-9])|(6.[0-9]))" />
     <maintainer>Moko Consulting</maintainer>
     <maintainerurl>https://mokoconsulting.tech</maintainerurl>
-    <targetplatform name='joomla' version='(5|6).*'/>
-    <php_minimum>8.1</php_minimum>
   </update>
-
   <update>
     <name>System - MokoWaaS</name>
-    <description>MokoWaaS system plugin — release candidate.</description>
-    <element>mokowaas</element>
+    <description>System - MokoWaaS update</description>
+    <element>system-mokowaas</element>
     <type>plugin</type>
-    <folder>system</folder>
-    <client>site</client>
     <version>02.01.14</version>
-    <creationDate>2026-04-21</creationDate>
-    <infourl title='MokoWaaS'>https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases</infourl>
-    <downloads>
-      <downloadurl type='full' format='zip'>https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02/mokowaas-02.01.14.zip</downloadurl>
-    </downloads>
-    <sha256></sha256>
+    <client>site</client>
+    <folder>system</folder>
     <tags><tag>rc</tag></tags>
+    <infourl title="System - MokoWaaS">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/v02.01.14</infourl>
+    <downloads>
+      <downloadurl type="full" format="zip">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02.01.14/system-mokowaas-02.01.14.zip</downloadurl>
+    </downloads>
+    <targetplatform name="joomla" version="((5.[0-9])|(6.[0-9]))" />
     <maintainer>Moko Consulting</maintainer>
     <maintainerurl>https://mokoconsulting.tech</maintainerurl>
-    <targetplatform name='joomla' version='(5|6).*'/>
-    <php_minimum>8.1</php_minimum>
   </update>
-
   <update>
     <name>System - MokoWaaS</name>
-    <description>MokoWaaS system plugin — Moko Consulting WaaS platform.</description>
-    <element>mokowaas</element>
+    <description>System - MokoWaaS update</description>
+    <element>system-mokowaas</element>
     <type>plugin</type>
-    <folder>system</folder>
-    <client>site</client>
     <version>02.01.14</version>
-    <creationDate>2026-04-21</creationDate>
-    <infourl title='MokoWaaS'>https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases</infourl>
-    <downloads>
-      <downloadurl type='full' format='zip'>https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02/mokowaas-02.01.14.zip</downloadurl>
-    </downloads>
-    <sha256></sha256>
+    <client>site</client>
+    <folder>system</folder>
     <tags><tag>stable</tag></tags>
+    <infourl title="System - MokoWaaS">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/v02.01.14</infourl>
+    <downloads>
+      <downloadurl type="full" format="zip">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02.01.14/system-mokowaas-02.01.14.zip</downloadurl>
+    </downloads>
+    <targetplatform name="joomla" version="((5.[0-9])|(6.[0-9]))" />
     <maintainer>Moko Consulting</maintainer>
     <maintainerurl>https://mokoconsulting.tech</maintainerurl>
-    <targetplatform name='joomla' version='(5|6).*'/>
-    <php_minimum>8.1</php_minimum>
   </update>
-
 </updates>