diff --git a/.gitea/workflows/update-server.yml b/.gitea/workflows/update-server.yml
index 73f4e2a3..e6a19247 100644
--- a/.gitea/workflows/update-server.yml
+++ b/.gitea/workflows/update-server.yml
@@ -270,37 +270,34 @@ jobs:
             SHA256=""
           fi
 
-          # -- Build the new entry -----------------------------------------
+          # -- Build the new entry (canonical format matching release.yml) --
           NEW_ENTRY=""
           NEW_ENTRY="${NEW_ENTRY}  <update>\n"
           NEW_ENTRY="${NEW_ENTRY}    <name>${EXT_NAME}</name>\n"
-          NEW_ENTRY="${NEW_ENTRY}    <description>${EXT_NAME} (${STABILITY})</description>\n"
+          NEW_ENTRY="${NEW_ENTRY}    <description>${EXT_NAME} ${STABILITY} build.</description>\n"
           NEW_ENTRY="${NEW_ENTRY}    <element>${EXT_ELEMENT}</element>\n"
           NEW_ENTRY="${NEW_ENTRY}    <type>${EXT_TYPE}</type>\n"
-          NEW_ENTRY="${NEW_ENTRY}    <version>${DISPLAY_VERSION}</version>\n"
-          NEW_ENTRY="${NEW_ENTRY}    <creationDate>$(date +%Y-%m-%d)</creationDate>\n"
           [ -n "$CLIENT_TAG" ] && NEW_ENTRY="${NEW_ENTRY}    ${CLIENT_TAG}\n"
           [ -n "$FOLDER_TAG" ] && NEW_ENTRY="${NEW_ENTRY}    ${FOLDER_TAG}\n"
-          NEW_ENTRY="${NEW_ENTRY}    <tags>\n"
-          NEW_ENTRY="${NEW_ENTRY}      <tag>${STABILITY}</tag>\n"
-          NEW_ENTRY="${NEW_ENTRY}    </tags>\n"
-          NEW_ENTRY="${NEW_ENTRY}    <infourl title=\"${EXT_NAME}\">${INFO_URL}</infourl>\n"
+          NEW_ENTRY="${NEW_ENTRY}    <version>${VERSION}</version>\n"
+          NEW_ENTRY="${NEW_ENTRY}    <creationDate>$(date +%Y-%m-%d)</creationDate>\n"
+          NEW_ENTRY="${NEW_ENTRY}    <infourl title='${EXT_NAME}'>https://git.mokoconsulting.tech/${GITEA_ORG}/${GITEA_REPO}/releases/tag/${RELEASE_TAG}</infourl>\n"
           NEW_ENTRY="${NEW_ENTRY}    <downloads>\n"
-          NEW_ENTRY="${NEW_ENTRY}      <downloadurl type=\"full\" format=\"zip\">${DOWNLOAD_URL}</downloadurl>\n"
+          NEW_ENTRY="${NEW_ENTRY}      <downloadurl type='full' format='zip'>${DOWNLOAD_URL}</downloadurl>\n"
           NEW_ENTRY="${NEW_ENTRY}    </downloads>\n"
           [ -n "$SHA256" ] && NEW_ENTRY="${NEW_ENTRY}    <sha256>${SHA256}</sha256>\n"
-          NEW_ENTRY="${NEW_ENTRY}    ${TARGET_PLATFORM}\n"
-          [ -n "$PHP_TAG" ] && NEW_ENTRY="${NEW_ENTRY}    ${PHP_TAG}\n"
+          NEW_ENTRY="${NEW_ENTRY}    <tags><tag>${STABILITY}</tag></tags>\n"
           NEW_ENTRY="${NEW_ENTRY}    <maintainer>Moko Consulting</maintainer>\n"
           NEW_ENTRY="${NEW_ENTRY}    <maintainerurl>https://mokoconsulting.tech</maintainerurl>\n"
+          NEW_ENTRY="${NEW_ENTRY}    <targetplatform name='joomla' version='(5|6).*'/>\n"
+          [ -n "$PHP_MINIMUM" ] && NEW_ENTRY="${NEW_ENTRY}    <php_minimum>${PHP_MINIMUM}</php_minimum>\n"
           NEW_ENTRY="${NEW_ENTRY}  </update>"
 
           # -- Write new entry to temp file --------------------------------
           printf '%b' "$NEW_ENTRY" > /tmp/new_entry.xml
 
-          # -- Merge into updates.xml (only update this stability channel) -
-          # Cascading update: each stability level updates itself and all lower levels
-          # stable → all | rc → rc,beta,alpha,dev | beta → beta,alpha,dev | alpha → alpha,dev | dev → dev
+          # -- Merge into updates.xml ----------------------------------------
+          # Cascade: stable→all | rc→rc+lower | beta→beta+lower | alpha→alpha+dev | dev→dev
           CASCADE_MAP="stable:development,alpha,beta,rc,stable rc:development,alpha,beta,rc beta:development,alpha,beta alpha:development,alpha development:development"
           TARGETS=""
           for entry in $CASCADE_MAP; do
@@ -313,62 +310,54 @@ jobs:
           done
           [ -z "$TARGETS" ] && TARGETS="${STABILITY}"
 
+          echo "Cascade: ${STABILITY} → ${TARGETS}"
+
+          # Create updates.xml if missing
           if [ ! -f "updates.xml" ]; then
             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
-          else
-            # Replace each cascading channel with the new entry (different tag)
-            export PY_TARGETS="$TARGETS"
-            python3 << PYEOF
+            printf '%s\n' "<!-- Copyright (C) $(date +%Y) Moko Consulting -->" >> updates.xml
+            printf '%s\n' "<updates>" >> updates.xml
+            printf '%s\n' "</updates>" >> updates.xml
+          fi
+
+          # Update existing blocks or create missing ones
+          export PY_TARGETS="$TARGETS" PY_VERSION="$VERSION" PY_DATE="$(date +%Y-%m-%d)"
+          python3 << 'PYEOF'
           import re, os
+
           targets = os.environ["PY_TARGETS"].split(",")
-          stability = "${STABILITY}"
+          version = os.environ["PY_VERSION"]
+          date = os.environ["PY_DATE"]
+
           with open("updates.xml") as f:
               content = f.read()
           with open("/tmp/new_entry.xml") as f:
               new_entry_template = f.read()
+
           for tag in targets:
               tag = tag.strip()
-              # Build entry with this tag
+              # Build entry with this tag's name
               new_entry = re.sub(r"<tag>[^<]*</tag>", f"<tag>{tag}</tag>", new_entry_template)
-              # Remove existing entry for this tag
-              pattern = r"  <update>.*?<tag>" + re.escape(tag) + r"</tag>.*?</update>\n?"
-              content = re.sub(pattern, "", content, flags=re.DOTALL)
-              # Insert before </updates>
-              content = content.replace("</updates>", new_entry + "\n</updates>")
+
+              # Try to find existing block (handles both single-line and multi-line <tags>)
+              block_pattern = r"(<update>(?:(?!</update>).)*?<tag>" + re.escape(tag) + r"</tag>.*?</update>)"
+              match = re.search(block_pattern, content, re.DOTALL)
+
+              if match:
+                  # Update in place — replace entire block
+                  content = content.replace(match.group(1), new_entry.strip())
+                  print(f"  UPDATED: <tag>{tag}</tag> → {version}")
+              else:
+                  # Create — insert before </updates>
+                  content = content.replace("</updates>", "\n" + new_entry.strip() + "\n\n</updates>")
+                  print(f"  CREATED: <tag>{tag}</tag> → {version}")
+
+          # Clean up excessive blank lines
           content = re.sub(r"\n{3,}", "\n\n", content)
+
           with open("updates.xml", "w") as f:
               f.write(content)
           PYEOF
-            if [ $? -ne 0 ]; then
-              # Fallback: rebuild keeping other stability entries
-              {
-                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
-                  if grep -q "<tag>${TAG}</tag>" updates.xml 2>/dev/null; then
-                    sed -n "/<update>/,/<\/update>/{ /<tag>${TAG}<\/tag>/p; }" updates.xml
-                  fi
-                done
-                cat /tmp/new_entry.xml
-                printf '\n%s\n' '</updates>'
-              } > /tmp/updates_new.xml
-              mv /tmp/updates_new.xml updates.xml
-            fi
-          fi
 
           # Commit
           git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"