diff --git a/Note: b/Note:
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/_index.md b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/_index.md
index c3b7a4da6e2..9fc10ba08da 100644
--- a/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/_index.md
+++ b/content/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/_index.md
@@ -38,9 +38,13 @@ From this section you can choose:
 
 ## Config File
 
+> **Note:** In Rancher v2.0.5 and v2.0.6, the names of services in the Config File (YAML) should contain underscores only: `kube_api` and `kube_controller`.
+
 Instead of using the Rancher UI to choose Kubernetes options for the cluster, advanced users can create an RKE config file. Using a config file allows you to set any of the [options available]({{< baseurl >}}/rke/v0.1.x/en/config-options/) in an RKE installation.
 
 - To edit an RKE config file directly from the Rancher UI, click **Edit as YAML**.
 - To read from an existing RKE file, click **Read from File**.
 
+![image]({{< baseurl >}}/img/rancher/cluster-options-yaml.png)
+
 For an example of RKE config file syntax, see the [RKE documentation]({{< baseurl >}}/rke/v0.1.x/en/example-yamls/).  
diff --git a/content/rke/v0.1.x/en/config-options/services/_index.md b/content/rke/v0.1.x/en/config-options/services/_index.md
index 905fcecc263..faecbdf08ec 100644
--- a/content/rke/v0.1.x/en/config-options/services/_index.md
+++ b/content/rke/v0.1.x/en/config-options/services/_index.md
@@ -5,7 +5,7 @@ weight: 230
 
 To deploy Kubernetes, RKE deploys several core components or services in Docker containers on the nodes. Based on the roles of the node, the containers deployed may be different.
 
-**All services support additional [custom arguments, Docker mount binds and extra environment variables]({{< baseurl >}}/rke/v0.1.x/en/config-options/services-extra).**
+**All services support additional [custom arguments, Docker mount binds and extra environment variables]({{< baseurl >}}/rke/v0.1.x/en/config-options/services/services-extras/).**
 
 ## etcd
 
@@ -17,6 +17,8 @@ By default, RKE will deploy a new etcd service, but you can also run Kubernetes
 
 ## Kubernetes API Server
 
+> **Note for Rancher 2 users** If you are configuring Cluster Options using a [Config File]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/#config-file) when creating [Rancher Launched Kubernetes]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/), the names of services should contain underscores only: `kube_api`. This only applies to Rancher v2.0.5 and v2.0.6.
+
 The [Kubernetes API](https://kubernetes.io/docs/reference/command-line-tools-reference/kube-apiserver/) REST service, which handles requests and data for all Kubernetes objects and provide shared state for all the other Kubernetes components.
 
 ```yaml
@@ -42,7 +44,7 @@ RKE supports the following options for the `kube-api` service :
 
 ## Kubernetes Controller Manager
 
- kube-controller
+> **Note for Rancher 2 users** If you are configuring Cluster Options using a [Config File]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/#config-file) when creating [Rancher Launched Kubernetes]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/), the names of services should contain underscores only: `kube_controller`. This only applies to Rancher v2.0.5 and v2.0.6.
 
 The [Kubernetes Controller Manager](https://kubernetes.io/docs/reference/command-line-tools-reference/kube-controller-manager/) service is the component responsible for running Kubernetes main control loops. The controller manager monitors the cluster desired state through the Kubernetes API server and makes the necessary changes to the current state to reach the desired state.
 
diff --git a/content/rke/v0.1.x/en/example-yamls/_index.md b/content/rke/v0.1.x/en/example-yamls/_index.md
index 681c9a1b744..97c69e63326 100644
--- a/content/rke/v0.1.x/en/example-yamls/_index.md
+++ b/content/rke/v0.1.x/en/example-yamls/_index.md
@@ -7,6 +7,8 @@ aliases:
 
 There are lots of different [configuration options]({{< baseurl >}}/rke/v0.1.x/en/config-options/) that can be set in the cluster configuration file for RKE. Here are some examples of files:
 
+> **Note for Rancher 2 users** If you are configuring Cluster Options using a [Config File]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/options/#config-file) when creating [Rancher Launched Kubernetes]({{< baseurl >}}/rancher/v2.x/en/cluster-provisioning/rke-clusters/), the names of services should contain underscores only: `kube_api` and `kube_controller`. This only applies to Rancher v2.0.5 and v2.0.6.
+
 ## Minimal `cluster.yml` example
 
 ```yaml
@@ -118,6 +120,7 @@ services:
       #   -----BEGIN PRIVATE KEY-----
       #   xxxxxxxxxx
       #   -----END PRIVATE KEY-----
+    # Note for Rancher 2 users: If you are configuring Cluster Options using a Config File when creating Rancher Launched Kubernetes, the names of services should contain underscores only: `kube_api`. This only applies to Rancher v2.0.5 and v2.0.6.
     kube-api:
       # IP range for any services created on Kubernetes
       # This must match the service_cluster_ip_range in kube-controller
@@ -134,6 +137,7 @@ services:
         delete-collection-workers: 3
         # Set the level of log output to debug-level
         v: 4
+    # Note for Rancher 2 users: If you are configuring Cluster Options using a Config File when creating Rancher Launched Kubernetes, the names of services should contain underscores only: `kube_controller`. This only applies to Rancher v2.0.5 and v2.0.6.
     kube-controller:
       # CIDR pool used to assign IP addresses to pods in the cluster
       cluster_cidr: 10.42.0.0/16
diff --git a/src/img/rancher/cluster-options-yaml.png b/src/img/rancher/cluster-options-yaml.png
new file mode 100644
index 00000000000..6259a6f9a34
Binary files /dev/null and b/src/img/rancher/cluster-options-yaml.png differ