diff --git a/doc-tools-check-languages.conf b/doc-tools-check-languages.conf
index 1d1dd92793..e7c6b87886 100644
--- a/doc-tools-check-languages.conf
+++ b/doc-tools-check-languages.conf
@@ -17,7 +17,7 @@ declare -A BOOKS=(
 # draft books
 declare -A DRAFTS=(
     ["fr"]="image-guide"
-    ["ja"]="install-guide user-guide user-guide-admin"
+    ["ja"]="install-guide"
     ["pt_BR"]="install-guide"
     ["zh_CN"]="install-guide"
 )
diff --git a/www/draft/draft-index.html b/www/draft/draft-index.html
index 81f879d3a7..423b624402 100644
--- a/www/draft/draft-index.html
+++ b/www/draft/draft-index.html
@@ -105,8 +105,6 @@
                         <a href="/draft/fr/image-guide/content/">Virtual Maching Image Guide</a>
                         <h4>Japanese (ja)</h4>
                         <a href="/ja/openstack-ops/content/">Operations Guide</a>
-                        <a href="/draft/ja/user-guide/">End User Guide (includes Python SDK)</a>
-                        <a href="/draft/ja/user-guide-admin/">Admin User Guide</a>
                         <h4>Spanish (es)</h4>
                         <a href="/es/api/quick-start/content/index.html">API Quick Start</a>
                         <h4>Vietnamese (vi_VN)</h4>
diff --git a/www/ja/index.html b/www/ja/index.html
index c9654137e0..1e07c7d29d 100644
--- a/www/ja/index.html
+++ b/www/ja/index.html
@@ -78,7 +78,6 @@
                 <div class="col-lg-6 col-md-6 col-sm-6">
                     <div class="docs-link-sections">
                         <h3 id="ops-and-admin-guides"><i class="fa fa-users"></i> 運用管理ガイド</h3>
-                        <a href="/admin-guide-cloud/content/">Cloud Administrator Guide (ドラフト版)</a>
                         <a href="/ja/high-availability-guide/content/">高可用性ガイド (ドラフト版)</a>
                         <a href="http://openstack-ja.github.io/openstack-manuals/openstack-ops/content/">運用ガイド</a>
                         <a href="/ja/security-guide/content/">セキュリティガイド (ドラフト版)</a>
@@ -88,8 +87,8 @@
                     <div class="docs-link-sections">
                         <h3><i class="fa fa-cloud"></i> ユーザーガイド</h3>
                         <a href="/ja/api/quick-start/content/">API クイックスタート (ドラフト版)</a>
-                        <a href="/ja/user-guide/content/">エンドユーザーガイド (Python SDK 付)(ドラフト版)</a>
-                        <a href="/ja/user-guide-admin/content/">管理ユーザーガイド (ドラフト版)</a>
+                        <a href="/ja/user-guide/">エンドユーザーガイド (Python SDK 付)(ドラフト版)</a>
+                        <a href="/ja/user-guide-admin/">管理ユーザーガイド (ドラフト版)</a>
                     </div>
                 </div>
             </div>