diff --git a/_data/support.yml b/_data/support.yml
index 1b8e80699a..3e9ec08ee4 100644
--- a/_data/support.yml
+++ b/_data/support.yml
@@ -53,5 +53,3 @@ toc:
     path: https://github.com/kubernetes/kubernetes/milestones/
   - title: Contributing to Kubernetes Documentation
     path: /editdocs/
-  - title: New Template Instructions
-    path: /docs/templatedemos/
diff --git a/docs/contribute/page-templates.md b/docs/contribute/page-templates.md
index 5bea261e3c..4b19cde39b 100644
--- a/docs/contribute/page-templates.md
+++ b/docs/contribute/page-templates.md
@@ -1,4 +1,7 @@
 ---
+redirect_from:
+  - /docs/templatedemos/
+  - /docs/templatedemos.html
 ---
 
 <!--<html>
diff --git a/docs/templatedemos/OWNERS b/docs/templatedemos/OWNERS
deleted file mode 100644
index d46d07a62e..0000000000
--- a/docs/templatedemos/OWNERS
+++ /dev/null
@@ -1,3 +0,0 @@
-assignees:
-- pwittrock
-
diff --git a/docs/templatedemos/blank.md b/docs/templatedemos/blank.md
deleted file mode 100644
index c81f757036..0000000000
--- a/docs/templatedemos/blank.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
----
-{% include templates/concept-overview.md %}
\ No newline at end of file
diff --git a/docs/templatedemos/blankkubectl.md b/docs/templatedemos/blankkubectl.md
deleted file mode 100644
index d88e330208..0000000000
--- a/docs/templatedemos/blankkubectl.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-assignees:
-- bgrant0607
-
----
-{% include templates/kubectl.md %}
\ No newline at end of file
diff --git a/docs/templatedemos/blanklanding.md b/docs/templatedemos/blanklanding.md
deleted file mode 100644
index 1225f1b8c5..0000000000
--- a/docs/templatedemos/blanklanding.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
----
-{% include templates/landing-page.md %}
\ No newline at end of file
diff --git a/docs/templatedemos/blanktask.md b/docs/templatedemos/blanktask.md
deleted file mode 100644
index 026c1afc41..0000000000
--- a/docs/templatedemos/blanktask.md
+++ /dev/null
@@ -1,3 +0,0 @@
----
----
-{% include templates/task.md %}
\ No newline at end of file
diff --git a/docs/templatedemos/filledout.md b/docs/templatedemos/filledout.md
deleted file mode 100644
index 9622fa2c14..0000000000
--- a/docs/templatedemos/filledout.md
+++ /dev/null
@@ -1,80 +0,0 @@
----
----
-{% assign concept="Pod" %}
-
-{% capture what_is %}
-A pod is the vehicle for running containers in Kubernetes. A pod consists of:
-
-- One or more containers
-- An IP address that is unique within the cluster
-- Optionally: Environment variables, storage volumes, and enterprise features (such as health checking)
-
-Resources are shared amongst containers in the pod. Containers within a pod also share an IP address and port space, and can find each other via localhost, or interprocess communications (such as semaphores).
-
-![Pod diagram](/images/docs/pod-overview.svg){: style="max-width: 25%" }
-{% comment %}https://drive.google.com/open?id=1pQe4-s76fqyrzB8f3xoJo4MPLNVoBlsE1tT9MyLNINg{% endcomment %}
-
-{% endcapture %}
-
-{% capture when_to_use %}
-Pods are used any time you need a container to be run. However, they are rarely created by a user, and are instead automatically created by controllers such as jobs, replication controllers, deployments, daemon set. The following table describes the strategy each controller uses to create pods.
-
-
-| Controller | Usage Strategy |
-|------------|----------------|
-| Deployment | For running pods as a continuous and healthy application |
-| Replication Controller | Used for the same purpose as Deployments (superseded Replication Controllers) |
-| Jobs | For running pods "to completion" (which are then shut down) |
-| Daemon Set | Mainly for performing operations on any nodes that match given parameters | 
-
-{% endcapture %}
-
-{% capture when_not_to_use %}
-Do not use pods directly. Pods should always be managed by a controller.
-{% endcapture %}
-
-{% capture status %}
-To retrieve the status of a pod, run the following command:
-
-```shell 
-kubectl get pod <name>
-```
-
-| Return Value | Description |
-|--------------|-------------|
-| `READY` | Describes the number of containers that are ready to receive traffic. |
-| `STATUS` | A value from the `PodPhase` enum describing the current status of the pod. Can be `Running`, `Pending`, `Succeeded`, `Failed`, and `Unknown`. |
-
-TODO: Link to refpage for `kubectl get pod`
-
-
-To get a full description of a pod, including past events, run the following command: 
-
-```shell
-kubectl describe pod <name>
-```
-
-TODO: Link to refpage for `kubectl describe pod`
-
-#### Possible status results
-
-| Value | Description |
-|------------|----------------|
-| Deployment | For running pods as a continuous and healthy application |
-| Replication Controller | Used for the same purpose as Deployments (superseded Replication Controllers) |
-| Jobs | For running pods "to completion" (which are then shut down) |
-| Daemon Set | Mainly for performing operations on any nodes that match given parameters | 
-
-{% endcapture %}
-
-{% capture usage %}
-Pods are defined when configuring the controller of your choice. In controller specifications,
-the parts that define the contents of the pod are inside the `template:` section.
-
-```yaml
-YAML EXAMPLE HERE
-```
-
-{% endcapture %}
-
-{% include templates/concept-overview.md %}
diff --git a/docs/templatedemos/index.md b/docs/templatedemos/index.md
deleted file mode 100644
index 88a94159f1..0000000000
--- a/docs/templatedemos/index.md
+++ /dev/null
@@ -1,249 +0,0 @@
----
-assignees:
-- pwittrock
-
----
-
-* TOC
-{:toc}
-
-## Before you Begin: Get the docs code checked out locally
-
-Check out the kubernetes/kubernetes.github.io repo and the docsv2 branch.
-
-### Step 1: Fork and Clone the repo
-
-- Fork [kubernetes/kubernetes.github.io](https://github.com/kubernetes/kubernetes.github.io)
-- [Setup your GitHub authentication using ssh](https://help.github.com/articles/generating-an-ssh-key/)
-- Clone the repo under ~/go/src/k8s.io
-
-```shell
-cd ~/go/src/k8s.io
-git clone git@github.com:<your-github-username>/kubernetes.github.io
-cd kubernetes.github.io
-git remote add upstream https://github.com/kubernetes/kubernetes.github.io.git
-```
-
-### Step 2: Switch to the docsv2 branch
-
-Docs v2 development is being performed in the `docsv2` branch.  This is the branch
-you want to be working from.
-
-From ~/go/src/k8s.io/kubernetes.github.io:
-
-```shell
-git checkout -b docsv2
-git fetch upstream
-git reset --hard upstream/docsv2
-```
-
-### Step 3: Make sure you can serve rendered docs
-
-One option is to simply rename your fork's repo on GitHub.com to `yourusername.github.io`, which will auto-stage your commits at that URL. 
-
-Or, just use Docker! Run this from within your local `kubernetes.github.io` directory and you should be good:
-
-```shell
-docker run -ti --rm -v "$PWD":/k8sdocs -p 4000:4000 gcr.io/google-samples/k8sdocs:1.0
-```
-
-The site will then be viewable at [http://localhost:4000/](http://localhost:4000/).
-
-Or, you can [follow the instructions](/editdocs/) for running a from-scratch staging server, which is both the most performant option and the biggest pain to get set up.
-
-## Writing Docs Using Templates
-
-### Types of Templates
-
-- Concept Template
-  - Introduce K8s Api Objects e.g. Pod
-- Task Template
-  - Step-by-step guide for "Doing X".  
-  - Useful for breaking down various ways of configuring Concepts into sub-topics
-- Landing Pages Template
-  - Collection of click-able cards on a grid
-  - Useful for directing users to actual content from a visual Table of Contents
-
-## Concept Overview Template Details
-
-A concept overview covers the most essential, important information about core
-Kubernetes concepts and features.  Examples of Concepts include `Pod`,
-`Deployment`, `Service`, etc.
-
-### Reference Examples
-
-- [Link to Example Template: Source](https://raw.githubusercontent.com/kubernetes/kubernetes.github.io/docsv2/docs/pod/index.md)
-- [Link to Example Template: Rendered](http://k8sdocs.github.io/docs/pod/)
-
-### Usage
-
-### Creating the file
-
-To create a new concept overview page, create a new directory with the concept
-name under the docs directory and an index.md file.
-e.g. `docs/your-concept-name/index.md`.
-
-### Adding the page to navigation
-
-Once your page is saved, somewhere in the `/docs/` directory, add a reference to the `concepts.yml` file under `/_data/` so that it will appear in the left-hand navigation of the site. This is also where you add a title to the page.
-
-### Adding the Template sections
-
-- concept: the concept name e.g. Pod
-- what_is: one sentence description the function / role  of the concept.  Diagrams are helpful.
-- when_to_use: disambiguate when to use this vs alternatives
-- when_not_to_use: highlight common anti-patterns
-- status: how to get the status for this object using kubectl
-- usage: example yaml
-- template: include the template at the end
-
-### Tags structure
-
-- `glossary:` a brief (~140 character) definition of what this concept is.
-- `object_rankings:` associates the page with API objects/functions.
-- `concept_rankings:` associates the page with Kubernetes concepts.
-- `command_rankings:` associates the page with CLI commands
-
-In each case, the association is ranked. If ranked "1," the topic will surface as a "Core Topic" (of high importance) on various associated pages. If ranked "2," the topic will be grouped under "Advanced Topics," which are deemed less essential.
-
-Only ranks 1 and 2 are supported.
-
-Tags are mandatory and should be thorough; they are the connective tissue of the site. To see them in action, [visit our sitemap](http://k8sdocs.github.io/docs/sitemap/).
-
-
-```liquid{% raw %}
----
-glossary: A pod is the vehicle for running containers in Kubernetes.
-object_rankings:
-- object: pod
-  rank: 1
-concept_rankings:
-- concept: pod
-  rank: 1
-command_rankings:
-- command: kubect describe
-  rank: 1
-- command: kubectl get
-  rank: 1
----
-{% capture concept %} concept-name-here {% endcapture %}
-{% capture what_is %} description-of-concept-here {% endcapture %}
-{% capture when_to_use %} when-to-use-here {% endcapture %}
-{% capture when_not_to_use %} anti-patterns-here {% endcapture %}
-{% capture status %} how-to-get-with-kubectl-here {% endcapture %}
-{% capture usage %} yaml-config-usage-here {% endcapture %}
-{% include templates/concept-overview.md %}
-{% endraw %}```
-
-
-## Task Template Details
-
-A task page offers step-by-step instructions for completing a task with Kubernetes. **A task page should be narrowly focused on task completion and not delve into concepts or reference information.**
-
-### Example
-
-- [Link to Example Template: Source](https://raw.githubusercontent.com/kubernetes/kubernetes.github.io/docsv2/docs/tasks/explicitly-scheduling-pod-node.md)
-- [Link to Example Template: Rendered](http://k8sdocs.github.io/docs/tasks/explicitly-scheduling-pod-node/)
-
-### Usage
-
-### Creating the file
-
-To create a new task page, create a file under docs/tasks/task-name.
-e.g. `docs/tasks/your-task-name`.
-
-Task filenames should match the title, chaining words with dashes in all lowercase, omitting articles and prepositions. For example, the topic "Explictly Scheduling a Pod on a Node" is stored in file `/docs/tasks/explicitly-scheduling-pod-node.md`.
-
-### Adding the page to navigation
-
-Add a reference to the `tasks.yml` file under `/_data/` so that it will appear in the left-hand navigation of the site. This is also where you add a title to the page.
-
-### Adding the Template sections
-
-- metadata: structured description of the doc content
-- purpose: one sentence description of the task and motivation
-- recommended_background: List of Concepts referenced or other Tasks, Tutorials that provide needed context
-- set_by_step: Add multiple sections.  1 per step in the task.
-- template: include the template at the end
-
-### Tags structure
-
-- `object_rankings:` associates the page with API objects/functions.
-- `concept_rankings:` associates the page with Kubernetes concepts.
-- `command_rankings:` associates the page with CLI commands
-
-In each case, the association is ranked. If ranked "1," the topic will surface as a "Core Topic" (of high importance) on various associated pages. If ranked "2," the topic will be grouped under "Advanced Topics," which are deemed less essential.
-
-Only ranks 1 and 2 are supported.
-
-Tags are mandatory and should be thorough; they are the connective tissue of the site. To see them in action, [visit our sitemap](http://k8sdocs.github.io/docs/sitemap/).
-
-
-```liquid{% raw %}
----
-object_rankings:
-- object: nodeAffinity
-  rank: 1
-- object: nodeSelector
-  rank: 2
-concept_rankings:
-- concept: node
-  rank: 1
-- concept: pod
-  rank: 1
-command_rankings:
-- command: kubectl label
-  rank: 1
-- command: kubectl get
-  rank: 2
----
-{% capture purpose %} task-description-here {% endcapture %}
-{% capture recommended_background %} prereq-reading-here {% endcapture %}
-{% capture step_by_step %} single-step-here {% endcapture %}
-{% include templates/task.md %}
-{% endraw %}```
-
-
-## Landing Pages
-
-Landing pages are a set of clickable "cards" arranged in a grid. Each card has a heading and description, and optioninall, a thumbnail image. They are meant to be index pages that quickly forward users on to deeper content.
-
-### Demos
-
-- [Link to Example Landing Page](https://raw.githubusercontent.com/kubernetes/kubernetes.github.io/master/docs/templatedemos/landingpage.md)
-- [Link to Rendered Landing Page](landingpage/)
-
-### Usage
-
-To use this template, create a new file with these contents. Essentially, you declare the cards you want by inserting the following YAML structure in the front-matter YAML section at the top of the page, and the body of the page just has the include statement.
-
-```yaml
----
-cards:
-- progression: no #"yes" = display cards as linearly progressing
-- card:
-  title: Mean Stack
-  image: /images/docs/meanstack/image_0.png
-  description: Lorem ipsum dolor it verberum.
-# repeat -card: items as necessary
----
-{% raw %}{% include templates/landing-page.md %}{% endraw %}
-```
-
-### Adding page to navigation
-
-Once your page is saved, somewhere in the `/docs/` directory, add a reference to the appropriate .yml file under `/_data/` so that it will appear in the left-hand navigation of the site. This is also where you add a title to the page.
-
-
-## kubectl yaml
-
-You probably shouldn't be using this, but we also have templates which consume YAML files that are generated by the Kubernetes authors. These are turned into pages which display the reference information for the various CLI tools.
-
-### Demos
-
-- [Link to Example Template](https://raw.githubusercontent.com/kubernetes/kubernetes.github.io/docsv2/docs/kubectl/kubectl_api-versions.md)
-- [Link to Rendered Template](http://k8sdocs.github.io/docs/kubectl/kubectl_api-versions/)
-
-### Adding page to navigation
-
-Once your page is saved, somewhere in the `/docs/` directory, add a reference to the `reference.yml` file under `/_data/` so that it will appear in the left-hand navigation of the site. This is also where you add a title to the page.
diff --git a/docs/templatedemos/kubectl.md b/docs/templatedemos/kubectl.md
deleted file mode 100644
index 29b5192000..0000000000
--- a/docs/templatedemos/kubectl.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-assignees:
-- bgrant0607
-
----
-{% capture command %}kubectl_annotate{% endcapture %}
-{% include templates/kubectl.md %}
\ No newline at end of file
diff --git a/docs/templatedemos/landingpage.md b/docs/templatedemos/landingpage.md
deleted file mode 100644
index 58ff8bebbc..0000000000
--- a/docs/templatedemos/landingpage.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-cards:
-- progression: no
-- card:
-  title: Mean Stack
-  image: /images/docs/meanstack/image_0.png
-  description: Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum.
-- card:
-  title: Guestbook + Redis
-  image: /images/docs/redis.svg
-  description: Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum.
-- card:
-  title: Cassandra
-  image: /images/docs/cassandra.svg
-  description: Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum.
-- card:
-  title: WordPress + MySQL
-  image: /images/docs/wordpress.svg
-  description: Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum.
-- card:
-  title: Mean Stack
-  image: /images/docs/meanstack/image_0.png
-  description: Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum.
-- card:
-  title: Guestbook + Redis
-  image: /images/docs/redis.svg
-  description: Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum.
-- card:
-  title: Cassandra
-  image: /images/docs/cassandra.svg
-  description: Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum.
-- card:
-  title: WordPress + MySQL
-  image: /images/docs/wordpress.svg
-  description: Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum.
-- card:
-  title: Mean Stack
-  image: /images/docs/meanstack/image_0.png
-  description: Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum.
-- card:
-  title: Guestbook + Redis
-  image: /images/docs/redis.svg
-  description: Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum.
-- card:
-  title: Cassandra
-  image: /images/docs/cassandra.svg
-  description: Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum.
-- card:
-  title: WordPress + MySQL
-  image: /images/docs/wordpress.svg
-  description: Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum. Lorem ipsum dolor it verberum.
----
-{% include templates/landing-page.md %}
\ No newline at end of file
diff --git a/docs/templatedemos/partial.md b/docs/templatedemos/partial.md
deleted file mode 100644
index 5180556ed2..0000000000
--- a/docs/templatedemos/partial.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
----
-
-{% assign concept="Replication Controller" %}
-
-{% include templates/concept-overview.md %}
\ No newline at end of file
diff --git a/docs/templatedemos/task.md b/docs/templatedemos/task.md
deleted file mode 100644
index 3803492f2b..0000000000
--- a/docs/templatedemos/task.md
+++ /dev/null
@@ -1,62 +0,0 @@
----
----
-# Doing a thing with a thing
-
-{% capture purpose %}
-This document teaches you how to do a thing.
-{% endcapture %}
-
-{% capture recommended_background %}
-In order to do a thing, you must be familiar with the following:
-
-- [Thing 1](/foo/)
-- [Thing 2](/bar/)
-
-{% endcapture %}
-
-{% capture step_by_step %}
-Here's how to do a thing with a thing.
-
-#### 1. Prepare the thing
-
-Lorem ipsum dolor it verberum.
-
-#### 2. Run the thing command
-
-Lorem ipsum dolor it verberum.
-
-#### 3. Create the thing.yaml file
-
-Lorem ipsum dolor it verberum.
-
-```yaml
-# Creates three nginx replicas
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: nginx-deployment
-spec:
-  replicas: 3
-  template:
-    metadata:
-      labels:
-        app: nginx
-    spec:
-      containers:
-      - name: nginx
-        image: nginx:1.7.9
-        ports:
-        - containerPort: 80
-```
-
-#### 4. ???
-
-Lorem ipsum dolor it verberum.
-
-#### 5. Profit!
-
-Lorem ipsum dolor it verberum.
-
-{% endcapture %}
-
-{% include templates/task.md %}
\ No newline at end of file
