diff --git a/_data/concepts.yml b/_data/concepts.yml
index d186b19b60..d4d49edc9f 100644
--- a/_data/concepts.yml
+++ b/_data/concepts.yml
@@ -49,6 +49,7 @@ toc:
 
 - title: Cluster Administration
   section:
+  - docs/concepts/cluster-administration/configure-etcd.md
   - docs/concepts/cluster-administration/etcd-upgrade.md
   - docs/concepts/cluster-administration/manage-deployment.md
   - docs/concepts/cluster-administration/networking.md
@@ -74,7 +75,6 @@ toc:
   section:
   - docs/concepts/storage/volumes.md
   - docs/concepts/storage/persistent-volumes.md
-  - docs/concepts/storage/etcd-store-api-object.md
 
 - title: Services, Load Balancing, and Networking
   section:
diff --git a/docs/concepts/storage/etcd-store-api-object.md b/docs/concepts/cluster-administration/configure-etcd.md
similarity index 94%
rename from docs/concepts/storage/etcd-store-api-object.md
rename to docs/concepts/cluster-administration/configure-etcd.md
index 4f92f07bd4..9454cf4ec1 100644
--- a/docs/concepts/storage/etcd-store-api-object.md
+++ b/docs/concepts/cluster-administration/configure-etcd.md
@@ -1,5 +1,8 @@
 ---
 title: Configuring Kubernetes Use of etcd
+redirect_from:
+- "/docs/concepts/storage/etcd-store-api-object/"
+- "/docs/concepts/storage/etcd-store-api-object.html"
 ---
 
 [etcd](https://coreos.com/etcd/docs/latest/) is a highly-available key value