diff --git a/sidebars.js b/sidebars.js
index 0b06d9b6..a9b187d6 100644
--- a/sidebars.js
+++ b/sidebars.js
@@ -228,24 +228,18 @@ const sidebars = {
             },
           ],
         },
-        {
-          type: 'category',
-          label: 'Run Analytical Queries',
-          collapsible: true,
-          items: [
-            {
-              type: 'doc',
-              id: 'scalardb-samples/scalardb-analytics-postgresql-sample/README',
-              label: 'Run ScalarDB Analytics with PostgreSQL',
-            },
-            // This doc no longer exists but we should have some type of doc here.
-            // {
-            //   type: 'doc',
-            //   id: 'scalardb-analytics-spark/getting-started',
-            //   label: 'Run ScalarDB Analytics',
-            // },
-          ],
-        },
+        // {
+        //   type: 'category',
+        //   label: 'Run Analytical Queries',
+        //   collapsible: true,
+        //   items: [
+        //     {
+        //       type: 'doc',
+        //       id: '<PATH_TO_FILE>',
+        //       label: '<LABEL>',
+        //     }
+        //   ],
+        // },
         {
           type: 'category',
           label: 'Run Non-Transactional Storage Operations',
@@ -305,6 +299,11 @@ const sidebars = {
               id: 'scalardb-samples/spring-data-microservice-transaction-sample/README',
               label: 'Microservice Transactions Through Spring Data JDBC',
             },
+            {
+              type: 'doc',
+              id: 'scalardb-samples/scalardb-analytics-postgresql-sample/README',
+              label: 'Analytical Queries by Using ScalarDB Analytics with PostgreSQL',
+            },
           ],
         },
         {
@@ -1068,24 +1067,18 @@ const sidebars = {
             },
           ],
         },
-        {
-          type: 'category',
-          label: '分析クエリを実行',
-          collapsible: true,
-          items: [
-            {
-              type: 'doc',
-              id: 'scalardb-samples/scalardb-analytics-postgresql-sample/README',
-              label: 'ScalarDB Analytics with PostgreSQL を実行',
-            },
-            // This doc no longer exists but we should have some type of doc here.
-            // {
-            //   type: 'doc',
-            //   id: 'scalardb-analytics-spark/getting-started',
-            //   label: 'Run ScalarDB Analytics',
-            // },
-          ],
-        },
+        // {
+        //   type: 'category',
+        //   label: '分析クエリを実行',
+        //   collapsible: true,
+        //   items: [
+        //     {
+        //       type: 'doc',
+        //       id: '<PATH_TO_FILE>',
+        //       label: '<LABEL>',
+        //     }
+        //   ],
+        // },
         {
           type: 'category',
           label: '非トランザクションストレージ操作を実行',
@@ -1145,6 +1138,11 @@ const sidebars = {
               id: 'scalardb-samples/spring-data-microservice-transaction-sample/README',
               label: 'Spring Data JDBC によるマイクロサービストランザクション',
             },
+            {
+              type: 'doc',
+              id: 'scalardb-samples/scalardb-analytics-postgresql-sample/README',
+              label: 'ScalarDB Analytics with PostgreSQL を使用した分析クエリ',
+            },
           ],
         },
         {
diff --git a/versioned_sidebars/version-3.12-sidebars.json b/versioned_sidebars/version-3.12-sidebars.json
index 871f0bc8..47ea4b71 100644
--- a/versioned_sidebars/version-3.12-sidebars.json
+++ b/versioned_sidebars/version-3.12-sidebars.json
@@ -208,23 +208,6 @@
             }
           ]
         },
-        {
-          "type": "category",
-          "label": "Run Analytical Queries",
-          "collapsible": true,
-          "items": [
-            {
-              "type": "doc",
-              "id": "scalardb-samples/scalardb-analytics-postgresql-sample/README",
-              "label": "Run ScalarDB Analytics with PostgreSQL"
-            },
-            {
-              "type": "doc",
-              "id": "scalardb-analytics-spark/getting-started",
-              "label": "Run ScalarDB Analytics with Spark"
-            }
-          ]
-        },
         {
           "type": "category",
           "label": "Run Non-Transactional Storage Operations",
@@ -283,6 +266,11 @@
               "type": "doc",
               "id": "scalardb-samples/spring-data-microservice-transaction-sample/README",
               "label": "Microservice Transactions Through Spring Data JDBC"
+            },
+            {
+              "type": "doc",
+              "id": "scalardb-samples/scalardb-analytics-postgresql-sample/README",
+              "label": "Analytical Queries by Using ScalarDB Analytics with PostgreSQL"
             }
           ]
         },
@@ -400,6 +388,11 @@
                   "id": "scalardb-analytics-postgresql/schema-importer",
                   "label": "PostgreSQL Schema Importer for PostgreSQL"
                 },
+                {
+                  "type": "doc",
+                  "id": "scalardb-analytics-spark/getting-started",
+                  "label": "Run ScalarDB Analytics with Spark"
+                },
                 {
                   "type": "doc",
                   "id": "scalardb-analytics-spark/configuration",
diff --git a/versioned_sidebars/version-3.13-sidebars.json b/versioned_sidebars/version-3.13-sidebars.json
index f1e13f13..4597251a 100644
--- a/versioned_sidebars/version-3.13-sidebars.json
+++ b/versioned_sidebars/version-3.13-sidebars.json
@@ -208,23 +208,6 @@
             }
           ]
         },
-        {
-          "type": "category",
-          "label": "Run Analytical Queries",
-          "collapsible": true,
-          "items": [
-            {
-              "type": "doc",
-              "id": "scalardb-samples/scalardb-analytics-postgresql-sample/README",
-              "label": "Run ScalarDB Analytics with PostgreSQL"
-            },
-            {
-              "type": "doc",
-              "id": "scalardb-analytics-spark/getting-started",
-              "label": "Run ScalarDB Analytics with Spark"
-            }
-          ]
-        },
         {
           "type": "category",
           "label": "Run Non-Transactional Storage Operations",
@@ -283,6 +266,11 @@
               "type": "doc",
               "id": "scalardb-samples/spring-data-microservice-transaction-sample/README",
               "label": "Microservice Transactions Through Spring Data JDBC"
+            },
+            {
+              "type": "doc",
+              "id": "scalardb-samples/scalardb-analytics-postgresql-sample/README",
+              "label": "Analytical Queries by Using ScalarDB Analytics with PostgreSQL"
             }
           ]
         },
@@ -400,6 +388,11 @@
                   "id": "scalardb-analytics-postgresql/schema-importer",
                   "label": "PostgreSQL Schema Importer for PostgreSQL"
                 },
+                {
+                  "type": "doc",
+                  "id": "scalardb-analytics-spark/getting-started",
+                  "label": "Run ScalarDB Analytics with Spark"
+                },
                 {
                   "type": "doc",
                   "id": "scalardb-analytics-spark/configuration",
@@ -1041,23 +1034,6 @@
             }
           ]
         },
-        {
-          "type": "category",
-          "label": "分析クエリを実行",
-          "collapsible": true,
-          "items": [
-            {
-              "type": "doc",
-              "id": "scalardb-samples/scalardb-analytics-postgresql-sample/README",
-              "label": "ScalarDB Analytics with PostgreSQL を実行"
-            },
-            {
-              "type": "doc",
-              "id": "scalardb-analytics-spark/getting-started",
-              "label": "ScalarDB Analytics を実行"
-            }
-          ]
-        },
         {
           "type": "category",
           "label": "非トランザクションストレージ操作を実行",
@@ -1116,6 +1092,11 @@
               "type": "doc",
               "id": "scalardb-samples/spring-data-microservice-transaction-sample/README",
               "label": "Spring Data JDBC によるマイクロサービストランザクション"
+            },
+            {
+              "type": "doc",
+              "id": "scalardb-samples/scalardb-analytics-postgresql-sample/README",
+              "label": "ScalarDB Analytics with PostgreSQL を使用した分析クエリ"
             }
           ]
         },
@@ -1233,6 +1214,11 @@
                   "id": "scalardb-analytics-postgresql/schema-importer",
                   "label": "PostgreSQL 用 Schema Importer"
                 },
+                {
+                  "type": "doc",
+                  "id": "scalardb-analytics-spark/getting-started",
+                  "label": "ScalarDB Analytics を実行"
+                },
                 {
                   "type": "doc",
                   "id": "scalardb-analytics-spark/configuration",