diff --git a/content/rancher/v2.x/en/backups/rollbacks/ha-server-rollbacks/_index.md b/content/rancher/v2.x/en/backups/rollbacks/ha-server-rollbacks/_index.md
index 4a82b2de7b2..758ab804aa2 100644
--- a/content/rancher/v2.x/en/backups/rollbacks/ha-server-rollbacks/_index.md
+++ b/content/rancher/v2.x/en/backups/rollbacks/ha-server-rollbacks/_index.md
@@ -47,10 +47,35 @@ If you upgrade Rancher, but the upgrade does not complete successfully, you may
 1. Enter the following command:
 
     ```
-kubectl --kubeconfig=kube_config-rancher-cluster.yml set image deployment/cattle cattle-server=rancher/rancher:<PRIOR_VERSION> -n cattle-system
+kubectl --kubeconfig=kube_config_rancher-cluster.yml set image deployment/cattle cattle-server=rancher/rancher:<PRIOR_VERSION> -n cattle-system
     ```
     Replace `<VERSION_TAG>` with the version that you were running before upgrade. For a list of tags available, see the [Rancher Forum Announcements](https://forums.rancher.com/c/announcements).
 
     **Step Result:** The rollback begins. Rancher Server may be unavailable for a few minutes.
 
-1. Log into Rancher. Confirm that the rollback succeeded by checking the version displayed in the bottom-left corner of the browser window.
\ No newline at end of file
+1. Log into Rancher. Confirm that the rollback succeeded by checking the version displayed in the bottom-left corner of the browser window.
+
+## Troubleshooting
+
+There is an issue with **rke v0.1.8** and below were the **rke-bundle-cert** container
+is left over from a failed etcd restore. If you are having an issue with restoring an
+**etcd snapshot** then you can do the following on each etcd nodes before attempting to
+do another restore:
+
+```
+docker container rm --force rke-bundle-cert
+```
+
+The rke-bundle-cert container is usally removed when a backup or restore of **etcd** succeeds.
+Whenever something goes wrong, the **rke-bundle-cert** container will be left over. You can look
+at the logs or inspect the container to see what the issue is.
+
+```
+docker container logs --follow rke-bundle-cert
+docker container inspect rke-bundle-cert
+```
+
+The important thing to note is the mounts of the container and location of the **pki.bundle.tar.gz**.
+
+As of **rke v0.1.9** and above, the **rke-bundle-cert** container is removed on both success and
+failure of a restore. To debug any issues, you will need to look at the **logs** generated from rke. 
diff --git a/content/rke/v0.1.x/en/installation/etcd-snapshots/_index.md b/content/rke/v0.1.x/en/installation/etcd-snapshots/_index.md
index c9be73a01dd..dfd6dd54dc7 100644
--- a/content/rke/v0.1.x/en/installation/etcd-snapshots/_index.md
+++ b/content/rke/v0.1.x/en/installation/etcd-snapshots/_index.md
@@ -218,3 +218,28 @@ nginx-65899c769f-kcdpr   1/1       Running   0          17s
 nginx-65899c769f-pc45c   1/1       Running   0          17s
 nginx-65899c769f-qkhml   1/1       Running   0          17s
 ```
+
+## Troubleshooting
+
+There is an issue with **rke v0.1.8** and below were the **rke-bundle-cert** container
+is left over from a failed etcd restore. If you are having an issue with restoring an
+**etcd snapshot** then you can do the following on each etcd nodes before attempting to
+do another restore:
+
+```
+docker container rm --force rke-bundle-cert
+```
+
+The rke-bundle-cert container is usally removed when a backup or restore of **etcd** succeeds.
+Whenever something goes wrong, the **rke-bundle-cert** container will be left over. You can look
+at the logs or inspect the container to see what the issue is.
+
+```
+docker container logs --follow rke-bundle-cert
+docker container inspect rke-bundle-cert
+```
+
+The important thing to note is the mounts of the container and location of the **pki.bundle.tar.gz**.
+
+As of **rke v0.1.9** and above, the **rke-bundle-cert** container is removed on both success and
+failure of a restore. To debug any issues, you will need to look at the **logs** generated from rke.