diff --git a/docs/common/cli/cli.adoc b/docs/about/05_cli.adoc
similarity index 96%
rename from docs/common/cli/cli.adoc
rename to docs/about/05_cli.adoc
index e1d8a5c619c..d97e7116dda 100644
--- a/docs/common/cli/cli.adoc
+++ b/docs/about/05_cli.adoc
@@ -16,6 +16,10 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
+= Helidon CLI
+:description: Helidon CLI
+:keywords: helidon cli
+
 == Introduction
 
 The Helidon CLI lets you easily create a Helidon project by picking from a
diff --git a/docs/mp/cli/01_cli.adoc b/docs/mp/cli/01_cli.adoc
deleted file mode 100644
index a073775f916..00000000000
--- a/docs/mp/cli/01_cli.adoc
+++ /dev/null
@@ -1,29 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-
-    Copyright (c) 2020 Oracle and/or its affiliates.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-///////////////////////////////////////////////////////////////////////////////
-
-= Helidon CLI
-:h1Prefix: MP
-:description: Helidon CLI
-:keywords: helidon cli
-
-The Helidon CLI enables developers to get started with Helidon with minimal
-effort: you can create a new application, build it, run it, and more, by
-running some simple commands.
-
-include::../../common/cli/cli.adoc[]
-
diff --git a/docs/mp/guides/02_quickstart.adoc b/docs/mp/guides/02_quickstart.adoc
index e4b27553ecb..3e24a22fa65 100644
--- a/docs/mp/guides/02_quickstart.adoc
+++ b/docs/mp/guides/02_quickstart.adoc
@@ -191,3 +191,9 @@ Runtime Images. For more information see:
 * <<mp/guides/36_graalnative.adoc,GraalVM Native Images>>
 * <<mp/guides/37_jlink_image.adoc,Custom Runtime Images using `jlink`>>
 
+== The Helidon CLI
+
+With the Helidon CLI you can create additional types of Helidon applications and
+use the "dev loop" to do fast, iterative development.
+<<about/05_cli.adoc,Try it now>>.
+
diff --git a/docs/se/cli/01_cli.adoc b/docs/se/cli/01_cli.adoc
deleted file mode 100644
index c10fa21128b..00000000000
--- a/docs/se/cli/01_cli.adoc
+++ /dev/null
@@ -1,29 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-
-    Copyright (c) 2020 Oracle and/or its affiliates.
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
-///////////////////////////////////////////////////////////////////////////////
-
-= Helidon CLI
-:h1Prefix: SE
-:description: Helidon CLI
-:keywords: helidon cli
-
-The Helidon CLI enables developers to get started with Helidon with minimal
-effort: you can create a new application, build it, run it, and more, by
-running some simple commands.
-
-include::../../common/cli/cli.adoc[]
-
diff --git a/docs/se/guides/02_quickstart.adoc b/docs/se/guides/02_quickstart.adoc
index a09311f72b9..ac6e13817ae 100644
--- a/docs/se/guides/02_quickstart.adoc
+++ b/docs/se/guides/02_quickstart.adoc
@@ -190,3 +190,9 @@ Runtime Images. For more information see:
 
 * <<se/guides/36_graalnative.adoc,GraalVM Native Images>>
 * <<se/guides/37_jlink_image.adoc,Custom Runtime Images using `jlink`>>
+
+== The Helidon CLI
+
+With the Helidon CLI you can create additional types of Helidon applications and
+use the "dev loop" to do fast, iterative development.
+<<about/05_cli.adoc,Try it now>>.
diff --git a/docs/sitegen.yaml b/docs/sitegen.yaml
index efde7f226c2..59859ec52a0 100644
--- a/docs/sitegen.yaml
+++ b/docs/sitegen.yaml
@@ -88,14 +88,6 @@ backend:
               items:
                 - includes:
                     - "se/guides/*.adoc"
-            - title: "CLI"
-              pathprefix: "/se/cli"
-              glyph:
-                type: "icon"
-                value: "computer"
-              items:
-                - includes:
-                    - "se/cli/*.adoc"
             - title: "Config"
               pathprefix: "/se/config"
               glyph:
@@ -235,14 +227,6 @@ backend:
               items:
                 - includes:
                     - "mp/guides/*.adoc"
-            - title: "CLI"
-              pathprefix: "/mp/cli"
-              glyph:
-                type: "icon"
-                value: "computer"
-              items:
-                - includes:
-                    - "mp/cli/*.adoc"
             - title: "Config"
               pathprefix: "/mp/config"
               glyph: