diff --git a/composer.json b/composer.json
index f9b9689c31..c0e152d910 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,9 @@
 {
     "name": "baserproject/basercms",
     "description": "baserCMS plugin for CakePHP",
-    "homepage": "https://basercms.net",
-    "type": "project",
     "license": "MIT",
+    "type": "project",
+    "homepage": "https://basercms.net",
     "require": {
         "php": ">=8.0",
         "ext-gd": "*",
@@ -29,6 +29,23 @@
         "vierge-noire/cakephp-fixture-factories": "^2.5",
         "vierge-noire/cakephp-test-suite-light": "^2.0"
     },
+    "replace": {
+        "baserproject/baser-core": "5.0.20",
+        "baserproject/bc-admin-third": "5.0.20",
+        "baserproject/bc-blog": "5.0.20",
+        "baserproject/bc-content-link": "5.0.20",
+        "baserproject/bc-custom-content": "5.0.20",
+        "baserproject/bc-editor-template": "5.0.20",
+        "baserproject/bc-favorite": "5.0.20",
+        "baserproject/bc-front": "5.0.20",
+        "baserproject/bc-installer": "5.0.20",
+        "baserproject/bc-mail": "5.0.20",
+        "baserproject/bc-search-index": "5.0.20",
+        "baserproject/bc-theme-config": "5.0.20",
+        "baserproject/bc-theme-file": "5.0.20",
+        "baserproject/bc-uploader": "5.0.20",
+        "baserproject/bc-widget-area": "5.0.20"
+    },
     "suggest": {
         "markstory/asset_compress": "An asset compression plugin which provides file concatenation and a flexible filter system for preprocessing and minification.",
         "dereuromark/cakephp-ide-helper": "After baking your code, this keeps your annotations in sync with the code evolving from there on for maximum IDE and PHPStan/Psalm compatibility.",
@@ -74,22 +91,12 @@
             "BcWidgetArea\\Test\\": "plugins/bc-widget-area/tests/"
         }
     },
-    "replace": {
-        "baserproject/baser-core": "5.0.20",
-        "baserproject/bc-admin-third": "5.0.20",
-        "baserproject/bc-blog": "5.0.20",
-        "baserproject/bc-content-link": "5.0.20",
-        "baserproject/bc-custom-content": "5.0.20",
-        "baserproject/bc-editor-template": "5.0.20",
-        "baserproject/bc-favorite": "5.0.20",
-        "baserproject/bc-front": "5.0.20",
-        "baserproject/bc-installer": "5.0.20",
-        "baserproject/bc-mail": "5.0.20",
-        "baserproject/bc-search-index": "5.0.20",
-        "baserproject/bc-theme-config": "5.0.20",
-        "baserproject/bc-theme-file": "5.0.20",
-        "baserproject/bc-uploader": "5.0.20",
-        "baserproject/bc-widget-area": "5.0.20"
+    "config": {
+        "sort-packages": true,
+        "allow-plugins": {
+            "cakephp/plugin-installer": true,
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     },
     "scripts": {
         "post-install-cmd": "App\\Console\\Installer::postInstall",
@@ -112,12 +119,5 @@
             "Composer\\Config::disableProcessTimeout",
             "vendor/bin/phpunit --colors=always"
         ]
-    },
-    "config": {
-        "sort-packages": true,
-        "allow-plugins": {
-            "cakephp/plugin-installer": true,
-            "dealerdirect/phpcodesniffer-composer-installer": true
-        }
     }
 }
diff --git a/plugins/baser-core/VERSION.txt b/plugins/baser-core/VERSION.txt
index 5675c6b7ba..f0362e7fcf 100644
--- a/plugins/baser-core/VERSION.txt
+++ b/plugins/baser-core/VERSION.txt
@@ -14,6 +14,13 @@
 CHG: 変更内容 / BUG: バグフィックス / NEW: 機能追加
 
 
+[2024-10-24] basercms-5.0.21
+- BUG [BC]	運営ユーザーが実行できないスクリプトイベントに「onerror」を追加
+- BUG [BC]	コンテンツ一覧でコンテンツを新規登録する際の通知メッセージをサニタイズ
+- BUG [BC]	ダッシュボードの受信メールのメールフォーム表示名についてサニタイズ
+- BUG [BC]	アップデート可能なバージョンの数量カウントが間違っていたため調整
+- BUG [BC]	コンテンツ管理でゴミ箱に入れた際、ツリー構造が壊れてしまう問題を改善
+
 [2024-07-18] basercms-5.0.20
 - CHG [BC]	アップデーターにて最新版ダウンロード時に、一時フォルダを初期化するようにした
 - CHG [BC]	アップデーターにてダウンロードするバージョンを指定できるようにした
diff --git a/plugins/baser-core/composer.json b/plugins/baser-core/composer.json
index 99e6a91dfd..76b248d602 100644
--- a/plugins/baser-core/composer.json
+++ b/plugins/baser-core/composer.json
@@ -15,20 +15,20 @@
         "josegonzalez/dotenv": "^3.2",
         "mobiledetect/mobiledetectlib": "^2.8",
         "ext-json": "*",
-        "baserproject/bc-admin-third": "5.0.x",
-        "baserproject/bc-blog": "5.0.x",
-        "baserproject/bc-content-link": "5.0.x",
-        "baserproject/bc-custom-content": "5.0.x",
-        "baserproject/bc-editor-template": "5.0.x",
-        "baserproject/bc-favorite": "5.0.x",
-        "baserproject/bc-front": "5.0.x",
-        "baserproject/bc-installer": "5.0.x",
-        "baserproject/bc-mail": "5.0.x",
-        "baserproject/bc-search-index": "5.0.x",
-        "baserproject/bc-theme-config": "5.0.x",
-        "baserproject/bc-theme-file": "5.0.x",
-        "baserproject/bc-uploader": "5.0.x",
-        "baserproject/bc-widget-area": "5.0.x",
+        "baserproject/bc-admin-third": "5.0.21",
+        "baserproject/bc-blog": "5.0.21",
+        "baserproject/bc-content-link": "5.0.21",
+        "baserproject/bc-custom-content": "5.0.21",
+        "baserproject/bc-editor-template": "5.0.21",
+        "baserproject/bc-favorite": "5.0.21",
+        "baserproject/bc-front": "5.0.21",
+        "baserproject/bc-installer": "5.0.21",
+        "baserproject/bc-mail": "5.0.21",
+        "baserproject/bc-search-index": "5.0.21",
+        "baserproject/bc-theme-config": "5.0.21",
+        "baserproject/bc-theme-file": "5.0.21",
+        "baserproject/bc-uploader": "5.0.21",
+        "baserproject/bc-widget-area": "5.0.21",
         "ext-mbstring": "*",
         "ext-zip": "*",
         "ext-gd": "*"