diff --git a/content/rancher/v2.x/en/installation/ha-server-install-helm/_index.md b/content/rancher/v2.x/en/installation/ha-install/_index.md
similarity index 69%
rename from content/rancher/v2.x/en/installation/ha-server-install-helm/_index.md
rename to content/rancher/v2.x/en/installation/ha-install/_index.md
index b61fc421174..a638152eecf 100644
--- a/content/rancher/v2.x/en/installation/ha-server-install-helm/_index.md
+++ b/content/rancher/v2.x/en/installation/ha-install/_index.md
@@ -6,16 +6,16 @@ draft: true
When installed as a Deployment in a Kubernetes cluster, Rancher will take integrate with the cluster's etcd database and Kubernetes scheduling for High-Availability.
-This procedure walks you through setting up a 3-node cluster with RKE and installing the Rancher chart the Helm package manager.
+This procedure walks you through setting up a 3-node cluster with RKE and installing the Rancher chart with the Helm package manager.
-> NOTE: For the best performance, we recommend this Kubernetes cluster be dedicated only the Rancher workload.
+> NOTE: For the best performance, we recommend this Kubernetes cluster is dedicated to only the Rancher workload.
## Recommended Architecture
* DNS for Rancher should resolve to a Layer 4 Load Balancer
* The Load Balancer should forward ports 80 and 443 TCP to all 3 nodes in the Kubernetes cluster.
-* The ingress controller will redirect http port 80 to https and terminate SSL/TLS on port 443.
-* The ingress controller will forward traffic to port 80 on the Pod in the Rancher Deployment.
+* The Ingress controller will redirect http port 80 to https and terminate SSL/TLS on port 443.
+* The Ingress controller will forward traffic to port 80 on the Pod in the Rancher Deployment.

@@ -29,7 +29,12 @@ The following CLI tools are required for this install. Please make sure these to
## Installation Outline
-1. [Create Nodes and Load Balancer](create-nodes-and-load-balancer/)
+1. [Create Nodes and Load Balancer](create-nodes-lb/)
1. [Install Kubernetes with RKE](install-kubernetes-rke/)
-1. [Initialize Helm (tiller)](helm-install/)
-1. [Install Rancher](rancher-install/)
+1. [Initialize Helm (tiller)](helm-init/)
+1. [Install Rancher](helm-rancher-install/)
+
+## Additional Install Options
+
+* [Migrating from RKE all-in-one install](migrating-from-rke-all-in-one/)
+* [RKE all-in-one install](rke-all-in-one/)
\ No newline at end of file
diff --git a/content/rancher/v2.x/en/installation/ha-server-install-helm/create-nodes-and-load-balancer/_index.md b/content/rancher/v2.x/en/installation/ha-install/create-nodes-lb/_index.md
similarity index 58%
rename from content/rancher/v2.x/en/installation/ha-server-install-helm/create-nodes-and-load-balancer/_index.md
rename to content/rancher/v2.x/en/installation/ha-install/create-nodes-lb/_index.md
index 6e0d227543e..a9f46cdf326 100644
--- a/content/rancher/v2.x/en/installation/ha-server-install-helm/create-nodes-and-load-balancer/_index.md
+++ b/content/rancher/v2.x/en/installation/ha-install/create-nodes-lb/_index.md
@@ -27,30 +27,11 @@ Collect the SSH credentials and DNS or IP addresses for your nodes to provide to
#### Ports
-##### Cluster External Ports
-
-These are ports that should be open between nodes and the external network for communication and management of Rancher.
-
-| Protocol | Ports | Description |
-| --- | --- | --- |
-| tcp | 22 | SSH for RKE install |
-| tcp | 80 | ingress controller - redirect to https |
-| tcp | 443 | ingress controller - https traffic to Rancher |
-| tcp | 6443 | https to kube-api, used by kubectl and helm |
-| tcp | 30000 - 32767 | Kubernetes NodePorts for k8s workloads |
+{{< requirements_ports_rancher_rke >}}
-##### Additional Ports Required Between Rancher Cluster Nodes
-
-In addition to the ports listed above these ports must be open between nodes.
-
-| Protocol | Ports | Description |
-| --- | --- | --- |
-| tcp | 2379-2380 | etcd |
-| udp | 8472 | overlay networking |
-| tcp | 10250 | kubelet |
-
+If you block ports internally on the nodes see the full [ports list]({{< baseurl >}}/rancher/v2.x/en/installation/references/) for all the communication details.
### Load Balancer
diff --git a/content/rancher/v2.x/en/installation/ha-server-install-helm/create-nodes-and-load-balancer/nlb/_index.md b/content/rancher/v2.x/en/installation/ha-install/create-nodes-lb/nlb/_index.md
similarity index 100%
rename from content/rancher/v2.x/en/installation/ha-server-install-helm/create-nodes-and-load-balancer/nlb/_index.md
rename to content/rancher/v2.x/en/installation/ha-install/create-nodes-lb/nlb/_index.md
diff --git a/content/rancher/v2.x/en/installation/ha-server-install-helm/helm-install/_index.md b/content/rancher/v2.x/en/installation/ha-install/helm-init/_index.md
similarity index 97%
rename from content/rancher/v2.x/en/installation/ha-server-install-helm/helm-install/_index.md
rename to content/rancher/v2.x/en/installation/ha-install/helm-init/_index.md
index 5b5192d6675..6370143a30a 100644
--- a/content/rancher/v2.x/en/installation/ha-server-install-helm/helm-install/_index.md
+++ b/content/rancher/v2.x/en/installation/ha-install/helm-init/_index.md
@@ -65,4 +65,4 @@ helm init --service-account tiller
> NOTE: This `tiller` install has full cluster access, which should be acceptable if the cluster is dedicated to Rancher server. Check out the [helm docs](https://docs.helm.sh/using_helm/#role-based-access-control) for restricting `tiller` access to suit your security requirements.
-### [Next: Install Rancher](../rancher-install/)
\ No newline at end of file
+### [Next: Install Rancher](../helm-rancher-install/)
\ No newline at end of file
diff --git a/content/rancher/v2.x/en/installation/ha-server-install-helm/rancher-install/_index.md b/content/rancher/v2.x/en/installation/ha-install/helm-rancher-install/_index.md
similarity index 100%
rename from content/rancher/v2.x/en/installation/ha-server-install-helm/rancher-install/_index.md
rename to content/rancher/v2.x/en/installation/ha-install/helm-rancher-install/_index.md
diff --git a/content/rancher/v2.x/en/installation/ha-server-install-helm/rancher-install/chart-options/_index.md b/content/rancher/v2.x/en/installation/ha-install/helm-rancher-install/chart-options/_index.md
similarity index 93%
rename from content/rancher/v2.x/en/installation/ha-server-install-helm/rancher-install/chart-options/_index.md
rename to content/rancher/v2.x/en/installation/ha-install/helm-rancher-install/chart-options/_index.md
index 9c7fb301654..6243357518f 100644
--- a/content/rancher/v2.x/en/installation/ha-server-install-helm/rancher-install/chart-options/_index.md
+++ b/content/rancher/v2.x/en/installation/ha-install/helm-rancher-install/chart-options/_index.md
@@ -21,6 +21,8 @@ weight: 276
| --- | --- | --- |
| `debug` | false | `bool` - set debug flag on rancher server |
| `imagePullSecrets` | [] | `list` - list of names of Secret resource containing private registry credentials |
+| `proxy` | "" | `string` - string - HTTP[S] proxy server for Rancher |
+| `noProxy` | "localhost,127.0.0.1" | `string` - comma seperated list of hostnames or ip address not to use the proxy |
| `resources` | {} | `map` - rancher pod resource requests & limits |
| `rancherImage` | "rancher/rancher" | `string` - rancher image source |
| `rancherImageTag` | same as chart version | `string` - rancher/rancher image tag |
diff --git a/content/rancher/v2.x/en/installation/ha-server-install-helm/rancher-install/tls-secrets/_index.md b/content/rancher/v2.x/en/installation/ha-install/helm-rancher-install/tls-secrets/_index.md
similarity index 100%
rename from content/rancher/v2.x/en/installation/ha-server-install-helm/rancher-install/tls-secrets/_index.md
rename to content/rancher/v2.x/en/installation/ha-install/helm-rancher-install/tls-secrets/_index.md
diff --git a/content/rancher/v2.x/en/installation/ha-server-install-helm/rancher-install/troubleshooting/_index.md b/content/rancher/v2.x/en/installation/ha-install/helm-rancher-install/troubleshooting/_index.md
similarity index 100%
rename from content/rancher/v2.x/en/installation/ha-server-install-helm/rancher-install/troubleshooting/_index.md
rename to content/rancher/v2.x/en/installation/ha-install/helm-rancher-install/troubleshooting/_index.md
diff --git a/content/rancher/v2.x/en/installation/ha-server-install-helm/install-kubernetes-rke/_index.md b/content/rancher/v2.x/en/installation/ha-install/install-kubernetes-rke/_index.md
similarity index 98%
rename from content/rancher/v2.x/en/installation/ha-server-install-helm/install-kubernetes-rke/_index.md
rename to content/rancher/v2.x/en/installation/ha-install/install-kubernetes-rke/_index.md
index 33c3583ca29..61c1f212969 100644
--- a/content/rancher/v2.x/en/installation/ha-server-install-helm/install-kubernetes-rke/_index.md
+++ b/content/rancher/v2.x/en/installation/ha-install/install-kubernetes-rke/_index.md
@@ -81,4 +81,4 @@ You will need to save a copy of the `kube_config_rancher-cluster.yml` and `ranch
See the [Troubleshooting](troubleshooting/) page.
-### [Next: Initialize Helm](../helm-install/)
\ No newline at end of file
+### [Next: Initialize Helm](../helm-init/)
\ No newline at end of file
diff --git a/content/rancher/v2.x/en/installation/ha-server-install-helm/install-kubernetes-rke/troubleshooting/_index.md b/content/rancher/v2.x/en/installation/ha-install/install-kubernetes-rke/troubleshooting/_index.md
similarity index 100%
rename from content/rancher/v2.x/en/installation/ha-server-install-helm/install-kubernetes-rke/troubleshooting/_index.md
rename to content/rancher/v2.x/en/installation/ha-install/install-kubernetes-rke/troubleshooting/_index.md
diff --git a/content/rancher/v2.x/en/installation/ha-server-install-helm/migrating-from-rke-all-in-one-install/_index.md b/content/rancher/v2.x/en/installation/ha-install/migrating-from-rke-all-in-one/_index.md
similarity index 95%
rename from content/rancher/v2.x/en/installation/ha-server-install-helm/migrating-from-rke-all-in-one-install/_index.md
rename to content/rancher/v2.x/en/installation/ha-install/migrating-from-rke-all-in-one/_index.md
index b79def6577d..5f7ab068ab6 100644
--- a/content/rancher/v2.x/en/installation/ha-server-install-helm/migrating-from-rke-all-in-one-install/_index.md
+++ b/content/rancher/v2.x/en/installation/ha-install/migrating-from-rke-all-in-one/_index.md
@@ -52,5 +52,5 @@ kubectl -n cattle-system delete serviceaccount cattle-admin
From here follow the standard install steps.
-* [3 - Initialize Helm (Install tiller)](../3-helm-install/)
-* [4 - Install Rancher](../4-rancher-install/)
+* [3 - Initialize Helm (Install tiller)](../helm-init/)
+* [4 - Install Rancher](../helm-rancher-install/)
diff --git a/content/rancher/v2.x/en/installation/ha-server-install-helm/rke-all-in-one-install/_index.md b/content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/_index.md
similarity index 71%
rename from content/rancher/v2.x/en/installation/ha-server-install-helm/rke-all-in-one-install/_index.md
rename to content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/_index.md
index 66a23807b73..25e835effd2 100644
--- a/content/rancher/v2.x/en/installation/ha-server-install-helm/rke-all-in-one-install/_index.md
+++ b/content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/_index.md
@@ -5,6 +5,6 @@ weight: 276
Rancher can be installed by providing the appropriate Kubernetes manifest configurations to RKE's `addons` feature. See the following instructions for examples appropriate to your environment.
-* [High Availability Installation with External Load Balancer (TCP/Layer 4)](./ha-server-install/)
-* [High Availability Installation with External Load Balancer (HTTPS/Layer 7)](./ha-server-install-external-lb)
-* [Troubleshooting RKE All-In-One Installs](./troubleshooting-ha)
+* [High Availability Installation with External Load Balancer (TCP/Layer 4)](install-layer-4-lb/)
+* [High Availability Installation with External Load Balancer (HTTPS/Layer 7)](install-layer-7-lb/)
+* [Troubleshooting RKE All-In-One Installs](troubleshooting/)
diff --git a/content/rancher/v2.x/en/installation/ha-server-install-helm/rke-all-in-one-install/ha-server-install/_index.md b/content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/install-layer-4-lb/_index.md
similarity index 100%
rename from content/rancher/v2.x/en/installation/ha-server-install-helm/rke-all-in-one-install/ha-server-install/_index.md
rename to content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/install-layer-4-lb/_index.md
diff --git a/content/rancher/v2.x/en/installation/ha-server-install-helm/rke-all-in-one-install/ha-server-install/nlb/_index.md b/content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/install-layer-4-lb/nlb/_index.md
similarity index 100%
rename from content/rancher/v2.x/en/installation/ha-server-install-helm/rke-all-in-one-install/ha-server-install/nlb/_index.md
rename to content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/install-layer-4-lb/nlb/_index.md
diff --git a/content/rancher/v2.x/en/installation/ha-server-install-helm/rke-all-in-one-install/ha-server-install-external-lb/_index.md b/content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/install-layer-7-lb/_index.md
similarity index 100%
rename from content/rancher/v2.x/en/installation/ha-server-install-helm/rke-all-in-one-install/ha-server-install-external-lb/_index.md
rename to content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/install-layer-7-lb/_index.md
diff --git a/content/rancher/v2.x/en/installation/ha-server-install-helm/rke-all-in-one-install/ha-server-install-external-lb/alb/_index.md b/content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/install-layer-7-lb/alb/_index.md
similarity index 100%
rename from content/rancher/v2.x/en/installation/ha-server-install-helm/rke-all-in-one-install/ha-server-install-external-lb/alb/_index.md
rename to content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/install-layer-7-lb/alb/_index.md
diff --git a/content/rancher/v2.x/en/installation/ha-server-install-helm/rke-all-in-one-install/ha-server-install-external-lb/nginx/_index.md b/content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/install-layer-7-lb/nginx/_index.md
similarity index 100%
rename from content/rancher/v2.x/en/installation/ha-server-install-helm/rke-all-in-one-install/ha-server-install-external-lb/nginx/_index.md
rename to content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/install-layer-7-lb/nginx/_index.md
diff --git a/content/rancher/v2.x/en/installation/ha-server-install-helm/rke-all-in-one-install/troubleshooting-ha/404-default-backend/_index.md b/content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/troubleshooting/404-default-backend/_index.md
similarity index 100%
rename from content/rancher/v2.x/en/installation/ha-server-install-helm/rke-all-in-one-install/troubleshooting-ha/404-default-backend/_index.md
rename to content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/troubleshooting/404-default-backend/_index.md
diff --git a/content/rancher/v2.x/en/installation/ha-server-install-helm/rke-all-in-one-install/troubleshooting-ha/_index.md b/content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/troubleshooting/_index.md
similarity index 100%
rename from content/rancher/v2.x/en/installation/ha-server-install-helm/rke-all-in-one-install/troubleshooting-ha/_index.md
rename to content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/troubleshooting/_index.md
diff --git a/content/rancher/v2.x/en/installation/ha-server-install-helm/rke-all-in-one-install/troubleshooting-ha/generic-troubleshooting/_index.md b/content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/troubleshooting/generic-troubleshooting/_index.md
similarity index 100%
rename from content/rancher/v2.x/en/installation/ha-server-install-helm/rke-all-in-one-install/troubleshooting-ha/generic-troubleshooting/_index.md
rename to content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/troubleshooting/generic-troubleshooting/_index.md
diff --git a/content/rancher/v2.x/en/installation/ha-server-install-helm/rke-all-in-one-install/troubleshooting-ha/job-complete-status/_index.md b/content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/troubleshooting/job-complete-status/_index.md
similarity index 100%
rename from content/rancher/v2.x/en/installation/ha-server-install-helm/rke-all-in-one-install/troubleshooting-ha/job-complete-status/_index.md
rename to content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/troubleshooting/job-complete-status/_index.md
diff --git a/content/rancher/v2.x/en/installation/ha-server-install-helm/rke-all-in-one-install/troubleshooting-ha/ssh-tunneling/_index.md b/content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/troubleshooting/ssh-tunneling/_index.md
similarity index 100%
rename from content/rancher/v2.x/en/installation/ha-server-install-helm/rke-all-in-one-install/troubleshooting-ha/ssh-tunneling/_index.md
rename to content/rancher/v2.x/en/installation/ha-install/rke-all-in-one/troubleshooting/ssh-tunneling/_index.md
diff --git a/layouts/shortcodes/requirements_ports_rancher_rke.html b/layouts/shortcodes/requirements_ports_rancher_rke.html
new file mode 100644
index 00000000000..41401055ff8
--- /dev/null
+++ b/layouts/shortcodes/requirements_ports_rancher_rke.html
@@ -0,0 +1,57 @@
+
These ports should be open between nodes and the external network for communication and management of Rancher.
+| Protocol | +Port | +Description | +
|---|---|---|
| TCP | +22 | +SSH for RKE | +
| TCP | +80 | +Ingress controller - redirect to HTTPS | +
| TCP | +443 | +Ingress controller - HTTPS traffic to Rancher | +
| TCP | +6443 | +HTTPS to kube-api, used by kubectl and helm | +
In addition to the ports listed above these ports must be open between nodes.
+| Protocol | +Port | +Description | +
|---|---|---|
| TCP | +2379-2380 | +etcd | +
| udp | +8472 | +Overlay networking | +
| TCP | +10250 | +kubelet | +