diff --git a/_data/guides.yml b/_data/guides.yml
index 3c7064014e..511ece0885 100644
--- a/_data/guides.yml
+++ b/_data/guides.yml
@@ -56,9 +56,13 @@ toc:
 
 - title: Containers and Pods
   section:
+  - docs/user-guide/simple-nginx.md
+  - docs/user-guide/pods/single-container.md
   - docs/user-guide/pods/multi-container.md
   - docs/user-guide/pods/init-container.md
+  - docs/user-guide/configuring-containers.md
   - docs/user-guide/pod-templates.md
+  - docs/user-guide/production-pods.md
   - docs/user-guide/containers.md
   - docs/user-guide/environment-guide/index.md
   - docs/user-guide/compute-resources.md
diff --git a/docs/tasks/index.md b/docs/tasks/index.md
index 242c1dca75..39f81c6751 100644
--- a/docs/tasks/index.md
+++ b/docs/tasks/index.md
@@ -1,14 +1,5 @@
 ---
 title: Tasks
-redirect_from:
-- "/docs/user-guide/production-pods/"
-- "/docs/user-guide/production-pods.html"
-- "/docs/user-guide/simple-nginx/"
-- "/docs/user-guide/simple-nginx.html"
-- "/docs/user-guide/pods/single-container/"
-- "/docs/user-guide/pods/single-container.html"
-- "/docs/user-guide/configuring-containers/"
-- "/docs/user-guide/configuring-containers.html"
 ---
 
 This section of the Kubernetes documentation contains pages that
diff --git a/docs/user-guide/configuring-containers.md b/docs/user-guide/configuring-containers.md
new file mode 100644
index 0000000000..8e09d7aaa4
--- /dev/null
+++ b/docs/user-guide/configuring-containers.md
@@ -0,0 +1,7 @@
+---
+title: Configuring Containers
+---
+
+{% include user-guide-content-moved.md %}
+
+[Tasks](/docs/tasks/)
diff --git a/docs/user-guide/pods/single-container.md b/docs/user-guide/pods/single-container.md
new file mode 100644
index 0000000000..fd7a44ba66
--- /dev/null
+++ b/docs/user-guide/pods/single-container.md
@@ -0,0 +1,7 @@
+---
+title: Creating Single-Container Pods
+---
+
+{% include user-guide-content-moved.md %}
+
+[Running a Stateless Application Using a Deployment](/docs/tutorials/stateless-application/run-stateless-application-deployment/)
diff --git a/docs/user-guide/production-pods.md b/docs/user-guide/production-pods.md
new file mode 100644
index 0000000000..5ea3a0edd5
--- /dev/null
+++ b/docs/user-guide/production-pods.md
@@ -0,0 +1,23 @@
+---
+title: Working with Containers in Production
+---
+
+{% include user-guide-content-moved.md %}
+
+* [Configuring a Pod to Use a Volume for Storage](/docs/tasks/configure-pod-container/configure-volume-storage/)
+
+* [Distributing Credentials Securely](/docs/tasks/configure-pod-container/distribute-credentials-secure/)
+
+* [Pulling an Image from a Private Registry](/docs/tasks/configure-pod-container/pull-image-private-registry/)
+
+* [Communicating Between Containers Running in the Same Pod](/docs/tasks/configure-pod-container/communicate-containers-same-pod/)
+
+* [Assigning CPU and RAM Resources to a Container](/docs/tasks/configure-pod-container/assign-cpu-ram-container/)
+
+* [Configuring Liveness and Readiness Probes](/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/)
+
+* [Configuring Pod Initialization](/docs/tasks/configure-pod-container/configure-pod-initialization/)
+
+* [Attaching Handlers to Container Lifecycle Events](/docs/tasks/configure-pod-container/attach-handler-lifecycle-event/)
+
+* [Determining the Reason for Pod Failure](/docs/tasks/debug-application-cluster/determine-reason-pod-failure/)
diff --git a/docs/user-guide/simple-nginx.md b/docs/user-guide/simple-nginx.md
new file mode 100644
index 0000000000..2a6b11133f
--- /dev/null
+++ b/docs/user-guide/simple-nginx.md
@@ -0,0 +1,7 @@
+---
+title: Running Your First Containers
+---
+
+{% include user-guide-content-moved.md %}
+
+[Running a Stateless Application Using a Deployment](/docs/tutorials/stateless-application/run-stateless-application-deployment/)