diff --git a/docs/migration-guides/bkpr-1.2-migration-guide.md b/docs/migration-guides/bkpr-1.2-migration-guide.md
new file mode 100644
index 0000000000..1f3963bc26
--- /dev/null
+++ b/docs/migration-guides/bkpr-1.2-migration-guide.md
@@ -0,0 +1,40 @@
+# Migration Guide: Moving to BKPR v1.2
+
+This document is for users who want to upgrade their Kubernetes clusters to BKPR v1.2 from BKPR v1.1. The document will assist in migrating a Kubernetes cluster to BKPR v1.2. Be sure to read this guide in its entirety before performing the upgrade.
+
+## Requirements
+
+* Kubernetes cluster with BKPR v1.1
+
+## Overview
+
+Making the move to BKPR v1.2 is a simple process that involves the following steps:
+
+1. Migrate Kibana index to 6.0
+1. Upgrade to BKPR v1.2
+
+## Migrate Kibana index to 6.0
+
+In BPKR v1.2, Elasticsearch and Kibana have been upgraded to version 6. Before upgrading to BKPR v1.2, your Kibana index needs to be reindexed in order to migrate to Kibana 6.
+
+Changes will be made to your Kibana index, it is recommended that you [backup your Kibana index](https://www.elastic.co/guide/en/elasticsearch/reference/5.6/modules-snapshots.html) before proceeding.
+
+The [official Kibana 6 index migration guide](https://www.elastic.co/guide/en/kibana/6.0/migrating-6.0-index.html#migrating-6.0-index) lists the steps to follow for migrating the Kibana index to the 6.0 format.
+
+> **Note**:
+>
+> To perform the migration with zero downtime, add `"index.format": 6` and `"index.mapping.single_type": true` under `settings` in the second step of the Kibana index migration guide.
+
+Access the Kibana console editor by visiting `https://kibana.my-domain.com/app/kibana#/dev_tools/console`* and execute the steps listed in the [Kibana index migration guide](https://www.elastic.co/guide/en/kibana/6.0/migrating-6.0-index.html#migrating-6.0-index).
+
+_*Replace `my-domain.com` in the above URL with the DNS suffix specified while installing BKPR_
+
+## Upgrade to BKPR v1.2
+
+Follow the [BKPR upgrade instructions](../workflow.md#upgrading) to upgrade BKPR in your Kubernetes cluster to v1.2.
+
+## Resources
+
+* [Elasticsearch 6.0 Release Notes](https://www.elastic.co/guide/en/elasticsearch/reference/6.0/es-release-notes.html)
+* [Elasticsearch 6.0 Breaking Changes](https://www.elastic.co/guide/en/elasticsearch/reference/6.0/breaking-changes-6.0.html)
+* [Migrating Kibana index to 6.0](https://www.elastic.co/guide/en/kibana/6.0/migrating-6.0-index.html)
diff --git a/docs/workflow.md b/docs/workflow.md
index bd00166377..00cd9825cc 100644
--- a/docs/workflow.md
+++ b/docs/workflow.md
@@ -144,11 +144,13 @@ Follow the [installation guide](install.md) to update the BKPR installer binary
 
 ### Step 2: Edit `kubeprod-manifest.jsonnet`
 
-Edit the `kubeprod-manifest.jsonnet` file and update the `import` statement to point to the location of the manifests from the downloaded BKPR release.
+The `kubeprod-manifest.jsonnet` file, generated by the `kubeprod install` command, imports BKPR jsonnet manifests and allows you to customize the BKPR configuration.
+
+Edit the `kubeprod-manifest.jsonnet` file and update the `import` statement to point to manifests from the downloaded BKPR release.
 
 ### Step 3: Perform the upgrade
 
-Re-run the `kubeprod install` command, from the [Prepare the cluster](step-2-deploy-bkpr) step, in the directory containing the existing `kubeprod-autogen.json` and updated `kubeprod-manifest.jsonnet` files.
+Change to the directory containing the existing `kubeprod-autogen.json` and updated `kubeprod-manifest.jsonnet` files and re-run the `kubeprod install` command, from the [Prepare the cluster](step-2-deploy-bkpr) step to upgrade the BKPR cluster components.
 
 ### Check-in changes
 
diff --git a/jenkins/Release_Notes.md.tmpl b/jenkins/Release_Notes.md.tmpl
index d63edbcc6e..dc76be15fb 100644
--- a/jenkins/Release_Notes.md.tmpl
+++ b/jenkins/Release_Notes.md.tmpl
@@ -8,5 +8,9 @@ Follow the [installation guide](https://github.com/bitnami/kube-prod-runtime/blo
 - [Azure Kubernetes Service (AKS)](https://github.com/bitnami/kube-prod-runtime/blob/master/docs/quickstart-aks.md)
 - [Google Kubernetes Engine (GKE)](https://github.com/bitnami/kube-prod-runtime/blob/master/docs/quickstart-gke.md)
 
+# Migration Guide
+
+- [BKPR v1.2 Migration Guide](https://github.com/bitnami/kube-prod-runtime/blob/master/docs/migration-guides/bkpr-1.2-migration-guide.md)
+
 # Changelog
 
diff --git a/manifests/components/images.json b/manifests/components/images.json
index fb53b4c3e4..da5dbc26a9 100644
--- a/manifests/components/images.json
+++ b/manifests/components/images.json
@@ -2,7 +2,7 @@
     "alertmanager": "bitnami/alertmanager:0.16.1-r1",
     "cert-manager": "bitnami/cert-manager:0.5.2-r37",
     "configmap-reload": "jimmidyson/configmap-reload:v0.2.2",
-    "elasticsearch": "bitnami/elasticsearch:5.6.14-r3",
+    "elasticsearch": "bitnami/elasticsearch:6.6.0-r12",
     "external-dns": "bitnami/external-dns:0.5.11-r1",
     "fluentd": "bitnami/fluentd:1.3.3-r23",
     "grafana": "bitnami/grafana:5.4.3-r18",