diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml
index 71d97034..30691bb6 100644
--- a/.mokogitea/manifest.xml
+++ b/.mokogitea/manifest.xml
@@ -8,7 +8,7 @@
     <name>MokoWaaS</name>
     <org>MokoConsulting</org>
     <description>White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments</description>
-    <version>02.17.00</version>
+    <version>02.18.00</version>
     <license spdx="GPL-3.0-or-later">GNU General Public License v3</license>
   </identity>
   <governance>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77d02677..0233ee35 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,8 @@
 # Changelog
 ## [Unreleased]
 
+## [02.18.00] --- 2026-05-28
+
 
 All notable changes to the MokoWaaS plugin will be documented in this file.
 
@@ -122,27 +124,3 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Removed
 - deploy-manual.yml workflow — using Joomla update server for distribution
 - Accidentally committed profile.ps1 and TODO.md
-
-## [02.01.43] - 2026-05-23
-
-### Added
-- Site Aliases tab with Joomla subform repeatable-table UI
-- Per-alias offline toggle with custom maintenance message (503 response)
-- Per-alias robots meta directive (index/noindex/follow/nofollow/none)
-- Per-alias backend redirect (admin panel redirects to primary domain)
-- 6 MokoWaaS API endpoints: health, install, update, cache, backup, info
-- Remote plugin install via `/?mokowaas=install` endpoint
-- Remote update trigger via `/?mokowaas=update` endpoint
-- Remote cache clear via `/?mokowaas=cache` endpoint (site + admin + opcache)
-- Remote Akeeba Backup trigger via `/?mokowaas=backup` endpoint
-- Compact site info via `/?mokowaas=info` endpoint
-
-### Changed
-- Site aliases moved from comma-separated text field to structured subform
-- Each alias now stores domain, offline, offline_message, robots, redirect_backend
-- Heartbeat provisioning updated for subform alias format
-- Grafana datasource names use domain-only (removed "MokoWaaS - " prefix)
-
-### Fixed
-- Heartbeat receiver accepts any 200 status (registered/updated/ok)
-- script.php uses heartbeat receiver instead of Grafana API (fixes 403 RBAC)
diff --git a/README.md b/README.md
index bc3a7c4c..326aa84d 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
  DEFGROUP: Joomla.Plugin
  INGROUP: MokoWaaS
  REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS
- VERSION: 02.17.00
+ VERSION: 02.18.00
  PATH: /README.md
  BRIEF: MokoWaaS platform plugin for Joomla
 -->
diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml
index 53f525cd..e3ad14e4 100644
--- a/src/packages/com_mokowaas/mokowaas.xml
+++ b/src/packages/com_mokowaas/mokowaas.xml
@@ -7,7 +7,7 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.17.00</version>
+	<version>02.18.00</version>
 	<description>Minimal API-only component for MokoWaaS. Provides REST endpoints for site health, cache, updates, and backups.</description>
 	<namespace path="api/src">Moko\Component\MokoWaaS\Api</namespace>
 	<administration>
diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml
index 3a391b70..bcb9fb8d 100644
--- a/src/packages/plg_system_mokowaas/mokowaas.xml
+++ b/src/packages/plg_system_mokowaas/mokowaas.xml
@@ -30,7 +30,7 @@
 	<license>GNU General Public License version 3 or later; see LICENSE.md</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.17.00</version>
+	<version>02.18.00</version>
 	<description>This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform.</description>
 	<namespace path=".">Moko\Plugin\System\MokoWaaS</namespace>
 	<scriptfile>script.php</scriptfile>
diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml
index fd7b22b8..ec1a1178 100644
--- a/src/packages/plg_webservices_mokowaas/mokowaas.xml
+++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml
@@ -7,7 +7,7 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.17.00</version>
+	<version>02.18.00</version>
 	<description>Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info.</description>
 	<namespace path="src">Moko\Plugin\WebServices\MokoWaaS</namespace>
 	<files>
diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml
index 421d31c1..cd93e5d9 100644
--- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml
+++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml
@@ -7,7 +7,7 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.17.00</version>
+	<version>02.18.00</version>
 	<description>Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds.</description>
 	<namespace path="src">Moko\Plugin\WebServices\PerfectPublisher</namespace>
 	<files>
diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml
index d1857753..d6b9fdaf 100644
--- a/src/pkg_mokowaas.xml
+++ b/src/pkg_mokowaas.xml
@@ -2,7 +2,7 @@
 <extension type="package" method="upgrade">
 	<name>MokoWaaS</name>
 	<packagename>mokowaas</packagename>
-	<version>02.17.00</version>
+	<version>02.18.00</version>
 	<creationDate>2026-05-23</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>