diff --git a/.github/workflows/auto-release.yml b/.github/workflows/auto-release.yml
index 749e3358..2570789f 100644
--- a/.github/workflows/auto-release.yml
+++ b/.github/workflows/auto-release.yml
@@ -103,7 +103,6 @@ jobs:
           echo "minor=$MINOR" >> "$GITHUB_OUTPUT"
           echo "major=$MAJOR" >> "$GITHUB_OUTPUT"
           echo "release_tag=stable" >> "$GITHUB_OUTPUT"
-          # Determine stability for mirror gating
           echo "stability=stable" >> "$GITHUB_OUTPUT"
           echo "skip=false" >> "$GITHUB_OUTPUT"
           if [ "$PATCH" = "00" ] || [ "$PATCH" = "01" ]; then
@@ -290,9 +289,15 @@ jobs:
           [ -z "$EXT_NAME" ] && EXT_NAME="${{ github.event.repository.name }}"
           [ -z "$EXT_TYPE" ] && EXT_TYPE="component"
 
-          # Templates/modules don't have <element> — derive from <name> (lowercased)
+          # Derive element if not in manifest:
+          # 1. Try XML filename (e.g. mokowaas.xml → mokowaas)
+          # 2. Fall back to repo name (lowercased)
           if [ -z "$EXT_ELEMENT" ]; then
-            EXT_ELEMENT=$(echo "$EXT_NAME" | tr '[:upper:]' '[:lower:]' | tr -d ' ')
+            EXT_ELEMENT=$(basename "$MANIFEST" .xml | tr '[:upper:]' '[:lower:]')
+            # If filename is generic (templateDetails, manifest), use repo name
+            case "$EXT_ELEMENT" in
+              templatedetails|manifest|*.xml) EXT_ELEMENT=$(echo "${{ github.event.repository.name }}" | tr '[:upper:]' '[:lower:]' | tr -d ' -') ;;
+            esac
           fi
 
           # Build client tag: plugins and frontend modules need <client>site</client>
@@ -320,8 +325,8 @@ jobs:
             PHP_TAG="<php_minimum>${PHP_MINIMUM}</php_minimum>"
           fi
 
-          DOWNLOAD_URL="${GITEA_URL}/${GITEA_ORG}/${GITEA_REPO}/releases/download/v${VERSION}/${EXT_ELEMENT}-${VERSION}.zip"
-          INFO_URL="${GITEA_URL}/${GITEA_ORG}/${GITEA_REPO}/releases/tag/v${VERSION}"
+          DOWNLOAD_URL="${GITEA_URL}/${GITEA_ORG}/${GITEA_REPO}/releases/download/stable/${EXT_ELEMENT}-${VERSION}.zip"
+          INFO_URL="${GITEA_URL}/${GITEA_ORG}/${GITEA_REPO}/releases/tag/stable"
 
           # -- Build update entry for a given stability tag
           build_entry() {
@@ -349,7 +354,12 @@ jobs:
           # -- Write updates.xml with cascading channels
           # Stable release updates ALL channels (development, alpha, beta, rc, stable)
           {
-            printf '%s\n' '<?xml version="1.0" encoding="utf-8"?>'
+            printf '%s\n' "<?xml version='1.0' encoding='UTF-8'?>"
+            printf '%s\n' "<!-- Copyright (C) $(date +%Y) Moko Consulting <hello@mokoconsulting.tech>"
+            printf '%s\n' " SPDX-License-Identifier: GPL-3.0-or-later"
+            printf '%s\n' " VERSION: ${VERSION}"
+            printf '%s\n' " -->"
+            printf '%s\n' ""
             printf '%s\n' '<updates>'
             build_entry "development"
             build_entry "alpha"
@@ -582,26 +592,68 @@ jobs:
               --author="gitea-actions[bot] <gitea-actions[bot]@mokoconsulting.tech>" || true
             git push || true
 
-            # Also update updates.xml on main via Gitea API (git push blocked by branch protection)
+            # Sync updates.xml to main via PR (respects branch protection)
             if [ "$CURRENT_BRANCH" != "main" ]; then
               GA_TOKEN="${{ secrets.GA_TOKEN }}"
               API="${GITEA_URL:-https://git.mokoconsulting.tech}/api/v1/repos/${{ github.repository }}"
+              PR_BRANCH="chore/update-xml-${VERSION}"
 
-              FILE_SHA=$(curl -sf -H "Authorization: token ${GA_TOKEN}" \
-                "${API}/contents/updates.xml?ref=main" | jq -r '.sha // empty')
+              # Create branch from main
+              MAIN_SHA=$(curl -sf -H "Authorization: token ${GA_TOKEN}" \
+                "${API}/branches/main" | jq -r '.commit.sha // empty')
 
-              if [ -n "$FILE_SHA" ]; then
-                CONTENT=$(base64 -w0 updates.xml)
-                curl -sf -X PUT -H "Authorization: token ${GA_TOKEN}" \
+              if [ -n "$MAIN_SHA" ]; then
+                curl -sf -X POST -H "Authorization: token ${GA_TOKEN}" \
                   -H "Content-Type: application/json" \
-                  "${API}/contents/updates.xml" \
-                  -d "$(jq -n \
-                    --arg content "$CONTENT" \
-                    --arg sha "$FILE_SHA" \
-                    --arg msg "chore: update stable channel to ${VERSION} on main [skip ci]" \
-                    --arg branch "main" \
-                    '{content: $content, sha: $sha, message: $msg, branch: $branch}'
-                  )" > /dev/null && echo "updates.xml synced to main via API" || echo "WARNING: failed to sync updates.xml to main"
+                  "${API}/branches" \
+                  -d "$(jq -n --arg name "$PR_BRANCH" --arg sha "$MAIN_SHA" \
+                    '{new_branch_name: $name, old_branch_name: "main"}')" > /dev/null 2>&1 || true
+
+                # Update updates.xml on the PR branch
+                FILE_SHA=$(curl -sf -H "Authorization: token ${GA_TOKEN}" \
+                  "${API}/contents/updates.xml?ref=${PR_BRANCH}" | jq -r '.sha // empty')
+
+                if [ -n "$FILE_SHA" ]; then
+                  CONTENT=$(base64 -w0 updates.xml)
+                  curl -sf -X PUT -H "Authorization: token ${GA_TOKEN}" \
+                    -H "Content-Type: application/json" \
+                    "${API}/contents/updates.xml" \
+                    -d "$(jq -n \
+                      --arg content "$CONTENT" \
+                      --arg sha "$FILE_SHA" \
+                      --arg msg "chore: update stable channel to ${VERSION} [skip ci]" \
+                      --arg branch "$PR_BRANCH" \
+                      '{content: $content, sha: $sha, message: $msg, branch: $branch}'
+                    )" > /dev/null 2>&1
+
+                  # Create PR
+                  PR_URL=$(curl -sf -X POST -H "Authorization: token ${GA_TOKEN}" \
+                    -H "Content-Type: application/json" \
+                    "${API}/pulls" \
+                    -d "$(jq -n \
+                      --arg title "chore: update updates.xml for ${VERSION} [skip ci]" \
+                      --arg head "$PR_BRANCH" \
+                      --arg base "main" \
+                      --arg body "Auto-generated by release workflow. Updates updates.xml with SHA-256 and download URLs for ${VERSION}." \
+                      '{title: $title, head: $head, base: $base, body: $body}'
+                    )" | jq -r '.number // empty')
+
+                  # Auto-merge the PR
+                  if [ -n "$PR_URL" ]; then
+                    curl -sf -X POST -H "Authorization: token ${GA_TOKEN}" \
+                      -H "Content-Type: application/json" \
+                      "${API}/pulls/${PR_URL}/merge" \
+                      -d '{"Do":"merge","merge_message_field":"chore: update updates.xml for '"${VERSION}"' [skip ci]"}' > /dev/null 2>&1 \
+                      && echo "updates.xml synced to main via PR #${PR_URL}" \
+                      || echo "PR #${PR_URL} created but auto-merge failed — merge manually"
+
+                    # Cleanup: delete PR branch
+                    curl -sf -X DELETE -H "Authorization: token ${GA_TOKEN}" \
+                      "${API}/branches/${PR_BRANCH}" > /dev/null 2>&1 || true
+                  else
+                    echo "WARNING: failed to create PR for updates.xml sync"
+                  fi
+                fi
               fi
             fi
           fi
diff --git a/.github/workflows/update-server.yml b/.github/workflows/update-server.yml
index 6eccdcef..cd9b5159 100644
--- a/.github/workflows/update-server.yml
+++ b/.github/workflows/update-server.yml
@@ -138,9 +138,12 @@ jobs:
           [ -z "$EXT_NAME" ] && EXT_NAME="${{ github.event.repository.name }}"
           [ -z "$EXT_TYPE" ] && EXT_TYPE="component"
 
-          # Templates and modules don't have <element> — derive from <name>
+          # Derive element if not in manifest: try XML filename, then repo name
           if [ -z "$EXT_ELEMENT" ]; then
-            EXT_ELEMENT=$(echo "$EXT_NAME" | tr '[:upper:]' '[:lower:]' | tr -d ' ')
+            EXT_ELEMENT=$(basename "$MANIFEST" .xml | tr '[:upper:]' '[:lower:]')
+            case "$EXT_ELEMENT" in
+              templatedetails|manifest|*.xml) EXT_ELEMENT=$(echo "${{ github.event.repository.name }}" | tr '[:upper:]' '[:lower:]' | tr -d ' -') ;;
+            esac
           fi
 
           # Use manifest version if README version is empty
@@ -298,7 +301,12 @@ jobs:
           [ -z "$TARGETS" ] && TARGETS="${STABILITY}"
 
           if [ ! -f "updates.xml" ]; then
-            printf '%s\n' '<?xml version="1.0" encoding="utf-8"?>' > updates.xml
+            printf '%s\n' "<?xml version='1.0' encoding='UTF-8'?>" > updates.xml
+            printf '%s\n' "<!-- Copyright (C) $(date +%Y) Moko Consulting <hello@mokoconsulting.tech>" >> updates.xml
+            printf '%s\n' " SPDX-License-Identifier: GPL-3.0-or-later" >> updates.xml
+            printf '%s\n' " VERSION: ${VERSION}" >> updates.xml
+            printf '%s\n' " -->" >> updates.xml
+            printf '%s\n' "" >> updates.xml
             printf '%s\n' '<updates>' >> updates.xml
             cat /tmp/new_entry.xml >> updates.xml
             printf '\n%s\n' '</updates>' >> updates.xml
@@ -329,7 +337,12 @@ jobs:
             if [ $? -ne 0 ]; then
               # Fallback: rebuild keeping other stability entries
               {
-                printf '%s\n' '<?xml version="1.0" encoding="utf-8"?>'
+                printf '%s\n' "<?xml version='1.0' encoding='UTF-8'?>"
+                printf '%s\n' "<!-- Copyright (C) $(date +%Y) Moko Consulting <hello@mokoconsulting.tech>"
+                printf '%s\n' " SPDX-License-Identifier: GPL-3.0-or-later"
+                printf '%s\n' " VERSION: ${VERSION}"
+                printf '%s\n' " -->"
+                printf '%s\n' ""
                 printf '%s\n' '<updates>'
                 for TAG in stable rc development; do
                   [ "$TAG" = "${STABILITY}" ] && continue
diff --git a/README.md b/README.md
index f0c31d75..1c438711 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
  DEFGROUP: Joomla.Plugin
  INGROUP: MokoWaaS
  REPO: https://github.com/mokoconsulting-tech/mokowaas
- VERSION: 02.01.14
+ VERSION: 02.01.15
  PATH: /README.md
  BRIEF: Rebranding plugin for MokoWaaS platform
  NOTE: Internal WaaS identity abstraction layer
diff --git a/src/mokowaas.xml b/src/mokowaas.xml
index 591603d4..65aceecf 100644
--- a/src/mokowaas.xml
+++ b/src/mokowaas.xml
@@ -23,6 +23,7 @@
 -->
 <extension type="plugin" group="system" method="upgrade">
 	<name>System - MokoWaaS</name>
+	<element>mokowaas</element>
 	<author>Moko Consulting</author>
 	<creationDate>2026-04-07</creationDate>
 	<copyright>Copyright (C) 2025 Moko Consulting. All rights reserved.</copyright>
@@ -36,8 +37,8 @@
 
 	<!-- Update server configuration -->
 	<updateservers>
-		<server type="extension" priority="1" name="MokoWaaS Update Server (GitHub)">https://raw.githubusercontent.com/mokoconsulting-tech/MokoWaaS/main/updates.xml</server>
-		<server type="extension" priority="2" name="MokoWaaS Update Server (Gitea)">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/updates.xml</server>
+		<server type="extension" priority="1" name="MokoWaaS Update Server (Gitea)">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/updates.xml</server>
+		<server type="extension" priority="2" name="MokoWaaS Update Server (GitHub)">https://raw.githubusercontent.com/mokoconsulting-tech/MokoWaaS/main/updates.xml</server>
 	</updateservers>
 
 	<files>
diff --git a/updates.xml b/updates.xml
index b3574f30..b1dce641 100644
--- a/updates.xml
+++ b/updates.xml
@@ -1,96 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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
+ -->
+
 <updates>
+
   <update>
     <name>System - MokoWaaS</name>
-    <description>System - MokoWaaS update</description>
+    <description>System - MokoWaaS (development)</description>
     <element>mokowaas</element>
     <type>plugin</type>
-    <version>02.01.15</version>
+    <version>02.01.15-dev</version>
     <client>site</client>
     <folder>system</folder>
-    <tags><tag>development</tag></tags>
-    <infourl title="System - MokoWaaS">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/stable</infourl>
+    <tags>
+      <tag>development</tag>
+    </tags>
+    <infourl title="System - MokoWaaS">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS</infourl>
     <downloads>
-      <downloadurl type="full" format="zip">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/stable/mokowaas-02.01.15.zip</downloadurl>
-      <downloadurl type="full" format="tar.gz">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/stable/mokowaas-02.01.15.tar.gz</downloadurl>
+      <downloadurl type="full" format="zip">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/mokowaas-02.01.15-dev.zip</downloadurl>
+      <downloadurl type="full" format="tar.gz">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/mokowaas-02.01.15-dev.tar.gz</downloadurl>
     </downloads>
-    
-    <targetplatform name="joomla" version="((5.[0-9])|(6.[0-9]))" />
-    <maintainer>Moko Consulting</maintainer>
-    <maintainerurl>https://mokoconsulting.tech</maintainerurl>
-  </update>
-  <update>
-    <name>System - MokoWaaS</name>
-    <description>System - MokoWaaS update</description>
-    <element>mokowaas</element>
-    <type>plugin</type>
-    <version>02.01.15</version>
-    <client>site</client>
-    <folder>system</folder>
-    <tags><tag>alpha</tag></tags>
-    <infourl title="System - MokoWaaS">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/stable</infourl>
-    <downloads>
-      <downloadurl type="full" format="zip">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/stable/mokowaas-02.01.15.zip</downloadurl>
-      <downloadurl type="full" format="tar.gz">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/stable/mokowaas-02.01.15.tar.gz</downloadurl>
-    </downloads>
-    
-    <targetplatform name="joomla" version="((5.[0-9])|(6.[0-9]))" />
-    <maintainer>Moko Consulting</maintainer>
-    <maintainerurl>https://mokoconsulting.tech</maintainerurl>
-  </update>
-  <update>
-    <name>System - MokoWaaS</name>
-    <description>System - MokoWaaS update</description>
-    <element>mokowaas</element>
-    <type>plugin</type>
-    <version>02.01.15</version>
-    <client>site</client>
-    <folder>system</folder>
-    <tags><tag>beta</tag></tags>
-    <infourl title="System - MokoWaaS">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/stable</infourl>
-    <downloads>
-      <downloadurl type="full" format="zip">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/stable/mokowaas-02.01.15.zip</downloadurl>
-      <downloadurl type="full" format="tar.gz">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/stable/mokowaas-02.01.15.tar.gz</downloadurl>
-    </downloads>
-    
-    <targetplatform name="joomla" version="((5.[0-9])|(6.[0-9]))" />
-    <maintainer>Moko Consulting</maintainer>
-    <maintainerurl>https://mokoconsulting.tech</maintainerurl>
-  </update>
-  <update>
-    <name>System - MokoWaaS</name>
-    <description>System - MokoWaaS update</description>
-    <element>mokowaas</element>
-    <type>plugin</type>
-    <version>02.01.15</version>
-    <client>site</client>
-    <folder>system</folder>
-    <tags><tag>rc</tag></tags>
-    <infourl title="System - MokoWaaS">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/stable</infourl>
-    <downloads>
-      <downloadurl type="full" format="zip">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/stable/mokowaas-02.01.15.zip</downloadurl>
-      <downloadurl type="full" format="tar.gz">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/stable/mokowaas-02.01.15.tar.gz</downloadurl>
-    </downloads>
-    
-    <targetplatform name="joomla" version="((5.[0-9])|(6.[0-9]))" />
-    <maintainer>Moko Consulting</maintainer>
-    <maintainerurl>https://mokoconsulting.tech</maintainerurl>
-  </update>
-  <update>
-    <name>System - MokoWaaS</name>
-    <description>System - MokoWaaS update</description>
-    <element>mokowaas</element>
-    <type>plugin</type>
-    <version>02.01.15</version>
-    <client>site</client>
-    <folder>system</folder>
-    <tags><tag>stable</tag></tags>
-    <infourl title="System - MokoWaaS">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/stable</infourl>
-    <downloads>
-      <downloadurl type="full" format="zip">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/stable/mokowaas-02.01.15.zip</downloadurl>
-      <downloadurl type="full" format="tar.gz">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/stable/mokowaas-02.01.15.tar.gz</downloadurl>
-    </downloads>
-    
+    <sha256>7fcd567f42dcdfee58aeb6fc82f904e1cd970be6ba2fae3690d279d7e48737ed</sha256>
     <targetplatform name="joomla" version="((5.[0-9])|(6.[0-9]))" />
     <maintainer>Moko Consulting</maintainer>
     <maintainerurl>https://mokoconsulting.tech</maintainerurl>