diff --git a/_data/guides.yml b/_data/guides.yml
index 7c41285d0e..ab622a0284 100644
--- a/_data/guides.yml
+++ b/_data/guides.yml
@@ -163,10 +163,10 @@ toc:
       path: /docs/getting-started-guides/gce/
     - title: Running Kubernetes on AWS EC2
       path: /docs/getting-started-guides/aws/
+    - title: Running Kubernetes on Azure
+      path: /docs/getting-started-guides/azure/
     - title: Running Kubernetes on Azure (Weave-based)
       path: /docs/getting-started-guides/coreos/azure/
-    - title: Running Kubernetes on Azure (Flannel-based)
-      path: /docs/getting-started-guides/azure/
     - title: Running Kubernetes on CenturyLink Cloud
       path: /docs/getting-started-guides/clc/
     - title: Running Kubernetes on IBM SoftLayer
diff --git a/docs/getting-started-guides/azure.md b/docs/getting-started-guides/azure.md
index a6f29ef030..40652e3172 100644
--- a/docs/getting-started-guides/azure.md
+++ b/docs/getting-started-guides/azure.md
@@ -5,12 +5,8 @@ assignees:
 
 ---
 
-* TOC
-{:toc}
-
-
-## Overview
-
 The recommended approach for deploying a Kubernetes 1.4 cluster on Azure is the
-[`kubernetes-anywhere`](https://github.com/kubernetes/kubernetes-anywhere) project. You will want to take a look at the
-[Azure Getting Started Guide](https://github.com/kubernetes/kubernetes-anywhere/blob/master/phase1/azure/README.md).
\ No newline at end of file
+[`kubernetes-anywhere`](https://github.com/kubernetes/kubernetes-anywhere) project.
+
+You will want to take a look at the
+[Azure Getting Started Guide](https://github.com/kubernetes/kubernetes-anywhere/blob/master/phase1/azure/README.md).
diff --git a/docs/getting-started-guides/index.md b/docs/getting-started-guides/index.md
index ec5eb98759..de7c06bd82 100644
--- a/docs/getting-started-guides/index.md
+++ b/docs/getting-started-guides/index.md
@@ -48,8 +48,8 @@ few commands, and have active community support.
 
 - [GCE](/docs/getting-started-guides/gce)
 - [AWS](/docs/getting-started-guides/aws)
+- [Azure](/docs/getting-started-guides/azure/)
 - [Azure](/docs/getting-started-guides/coreos/azure/) (Weave-based, contributed by WeaveWorks employees)
-- [Azure](/docs/getting-started-guides/azure/) (Flannel-based, contributed by Microsoft employee)
 - [CenturyLink Cloud](/docs/getting-started-guides/clc)
 - [IBM SoftLayer](https://github.com/patrocinio/kubernetes-softlayer)
 
@@ -122,7 +122,7 @@ Stackpoint.io        |              | multi-support       | multi-support   | [d
 AppsCode.com         | Saltstack    | Debian | multi-support | [docs](https://appscode.com/products/cloud-deployment/) |    | Commercial
 GCE                  | Saltstack    | Debian | GCE         | [docs](/docs/getting-started-guides/gce)                                    | ['œ“][1]   | Project
 Azure                | CoreOS       | CoreOS | Weave       | [docs](/docs/getting-started-guides/coreos/azure/)                    |          | Community ([@errordeveloper](https://github.com/errordeveloper), [@squillace](https://github.com/squillace), [@chanezon](https://github.com/chanezon), [@crossorigin](https://github.com/crossorigin))
-Azure                | CoreOS       | CoreOS | flannel     | [docs](/docs/getting-started-guides/azure)                    |          | Community ([@colemickens](https://github.com/colemickens))
+Azure                | Ignition     | Ubuntu | Azure       | [docs](/docs/getting-started-guides/azure)                    |          | Community (Microsoft: [@brendandburns](https://github.com/brendandburns), [@colemickens](https://github.com/colemickens))
 Docker Single Node   | custom       | N/A    | local       | [docs](/docs/getting-started-guides/docker)                                 |          | Project ([@brendandburns](https://github.com/brendandburns))
 Docker Multi Node    | custom       | N/A    | flannel     | [docs](/docs/getting-started-guides/docker-multinode)                       |          | Project ([@brendandburns](https://github.com/brendandburns))
 Bare-metal           | Ansible      | Fedora | flannel     | [docs](/docs/getting-started-guides/fedora/fedora_ansible_config)           |          | Project