diff --git a/docs/sources/cli.md b/docs/sources/administration/cli.md
similarity index 99%
rename from docs/sources/cli.md
rename to docs/sources/administration/cli.md
index e5e3ac6f2b5..0e8e6e611e0 100644
--- a/docs/sources/cli.md
+++ b/docs/sources/administration/cli.md
@@ -1,6 +1,6 @@
 ---
 aliases:
-  - administration/cli/
+  - ../cli/ # /docs/grafana/latest/cli/
 description: Guide to using grafana server cli
 keywords:
   - grafana
@@ -12,7 +12,7 @@ labels:
     - enterprise
     - oss
 title: Grafana server CLI
-weight: 400
+weight: 1100
 ---
 
 # Grafana server CLI
diff --git a/docs/sources/search/_index.md b/docs/sources/administration/search/_index.md
similarity index 94%
rename from docs/sources/search/_index.md
rename to docs/sources/administration/search/_index.md
index 9fb729a3c07..5bd777e9f01 100644
--- a/docs/sources/search/_index.md
+++ b/docs/sources/administration/search/_index.md
@@ -1,4 +1,6 @@
 ---
+aliases:
+  - ../search/ # /docs/grafana/latest/search/
 description: Use the command palette to search all of Grafana and initiate key actions
 keywords:
   - search
@@ -13,7 +15,6 @@ labels:
     - oss
 menutitle: Search
 title: Search
-weight: 80
 ---
 
 # Grafana search