diff --git a/content/rancher/installation/server-installation/_index.md b/content/rancher/installation/server-installation/_index.md
index 557d226341e..f413026489c 100644
--- a/content/rancher/installation/server-installation/_index.md
+++ b/content/rancher/installation/server-installation/_index.md
@@ -1,9 +1,9 @@
 ---
-title: "{{ replace .TranslationBaseName "-" " " | title }}"
+title: "Rancher Server Installation"
 date: {{ .Date }}
 draft: true
-tags: [ "tag", "tag", "tag", "tag" ]
-layout: single-left
+tags: [ "install" ]
+layout: list
 categories:
   - "rancher"
 ---
diff --git a/content/rancher/tasks/clusters/creating-a-cluster/create-cluster-azure-container-service.md b/content/rancher/tasks/clusters/creating-a-cluster/create-cluster-azure-container-service.md
index 71fa20d9ebb..4e1b465c493 100644
--- a/content/rancher/tasks/clusters/creating-a-cluster/create-cluster-azure-container-service.md
+++ b/content/rancher/tasks/clusters/creating-a-cluster/create-cluster-azure-container-service.md
@@ -1,7 +1,7 @@
 ---
 tag: ["rancher", "cluster"]
 category: "rancher"
-layout: list-docs
+layout: single
 title: Azure Container Service
 weight: 30
 ---
@@ -10,6 +10,8 @@ weight: 30
 
 You can use Rancher to create a cluster using Microsoft Azure Container Service.
 
+{{< beta-note_azure >}}
+
 1. From the **Clusters** page, click **Add Cluster**.
 
 2. Choose **Azure Container Service**.
diff --git a/layouts/shortcodes/beta-note_azure.html b/layouts/shortcodes/beta-note_azure.html
new file mode 100644
index 00000000000..61af0c6df35
--- /dev/null
+++ b/layouts/shortcodes/beta-note_azure.html
@@ -0,0 +1,4 @@
+<blockquote>
+	<strong>Note:</strong>
+	<p>As of {{< product >}} {{< version >}} GA, the Azure Container Service option is still in beta.</p>
+</blockquote>