diff --git a/apigee_mirror/README.md b/apigee_mirror/README.md
new file mode 100644
index 0000000..ed803af
--- /dev/null
+++ b/apigee_mirror/README.md
@@ -0,0 +1,46 @@
+Apigee Mirror Playbook Sample
+=============================
+
+This playbook demonstrate how to work with an Apigee OPDK mirror. This playbook creates an installation with the 
+components needed to carry out the following activities: 
+ 
+ * Create an Apigee Mirror
+ * Retrieve an Apigee Mirror
+ * Upload an Apigee Mirror
+ * Install an Apigee Mirror
+ 
+# Creating and Retrieving an Apigee Mirror
+Assuming you need to create an Apigee mirror, then you can use the following playbook with default settings to create a 
+minimum environment that will create and download an Apigee mirror: 
+
+    ansible-playbook create_download_apigee_mirror.yml -vv -b
+    
+## Create an Apigee Mirror
+Assuming you have a working instance of Apigee OPDK and you need to create an Apigee mirror with the playbook default 
+settings, then you can use the following:
+
+    ansible-playbook create_download_apigee_mirror.yml -vv -b --tags=create
+    
+## Retrieve an Apigee Mirror
+Assuming you have created an Apigee OPDK mirror with the default settings and you need to download an Apigee mirror, 
+then you can use the following playbook: 
+ 
+    ansible-playbook create_download_apigee_mirror.yml -vv -b --tags=download
+
+# Uploading and Installing an Apigee Mirror
+Assuming you need to upload and install an Apigee mirror with the playbook default settings, then you can use the 
+following:
+   
+    ansible-playbook upload_install_apigee_mirror.yml -vv -b
+    
+## Upload an Apigee Mirror
+Assuming you have an Apigee OPDK mirror in the location set by the playbook default settings and you need to upload the
+mirror to a server, then you can use the following:
+
+    ansible-playbook upload_install_apigee_mirror.yml -vv -b --tags=upload
+
+## Install an Apigee Mirror
+Assuming you have an Apigee OPDK mirror already uploaded to the location set by the playbook default settings and you 
+need to install that Apigee mirror, then you can use the following:
+
+    ansible-playbook upload_install_apigee_mirror.yml -vv -b --tags=install
diff --git a/apigee_mirror/components/opdk-create-download-apigee-mirror.yml b/apigee_mirror/components/opdk-create-download-apigee-mirror.yml
index 4929c52..7c3f3f0 100644
--- a/apigee_mirror/components/opdk-create-download-apigee-mirror.yml
+++ b/apigee_mirror/components/opdk-create-download-apigee-mirror.yml
@@ -4,17 +4,30 @@
   - ~/.apigee/credentials.yml
   roles:
   - opdk-setup-apigee-user
+  tags:
+  - user
+
+- hosts: '{{ hosts }}'
+  vars_files:
+  - ~/.apigee/credentials.yml
+  roles:
   - opdk-setup-os-limits
+  tags:
+  - os
 
 - hosts: '{{ hosts }}'
   roles:
   - opdk-setup-openjdk
+  tags:
+  - openjdk
 
 - hosts: '{{ hosts }}'
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
   - opdk-setup-bootstrap
+  tags:
+  - bootstrap
 
 - hosts: '{{ hosts }}'
   vars_files:
@@ -22,7 +35,21 @@
   roles:
   - opdk-setup-silent-installation-config
   - opdk-setup-component-installer
+  tags:
+  - installer
+
+- hosts: '{{ hosts }}'
+  vars_files:
+  - ~/.apigee/credentials.yml
+  roles:
   - opdk-setup-bootstrap-create-archive
+  tags:
+  - create
+
+- hosts: '{{ hosts }}'
+  vars_files:
+  - ~/.apigee/credentials.yml
+  roles:
   - opdk-setup-bootstrap-download-archive
   tags:
   - download
diff --git a/apigee_mirror/create_download_apigee_mirror.yml b/apigee_mirror/create_download_apigee_mirror.yml
index a5c6eb7..ab9e91a 100644
--- a/apigee_mirror/create_download_apigee_mirror.yml
+++ b/apigee_mirror/create_download_apigee_mirror.yml
@@ -1,8 +1,4 @@
 ---
-- include: configuration/opdk-credentials.yml
-  vars:
-    hosts: 'planet'
-
 - include: configuration/opdk-setup-os.yml
   vars:
     hosts: 'planet'
diff --git a/apigee_mirror/requirements.yml b/apigee_mirror/requirements.yml
index 713340d..945f343 100644
--- a/apigee_mirror/requirements.yml
+++ b/apigee_mirror/requirements.yml
@@ -32,6 +32,9 @@
 - src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap
   name: opdk-setup-bootstrap
 
+- src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-rollback
+  name: opdk-setup-bootstrap-rollback
+
 - src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap-upload-archive
   name: opdk-setup-bootstrap-upload-archive
 
diff --git a/apigee_mirror/upload_install_apigee_mirror.yml b/apigee_mirror/upload_install_apigee_mirror.yml
index 8abfe01..245dbad 100644
--- a/apigee_mirror/upload_install_apigee_mirror.yml
+++ b/apigee_mirror/upload_install_apigee_mirror.yml
@@ -8,5 +8,5 @@
     hosts: 'planet'
     jdk_version: '1.8'
   tags:
-  - upload
+  - upload_install