diff --git a/rebuild.yml b/rebuild.yml
new file mode 100644
index 0000000..18e97e7
--- /dev/null
+++ b/rebuild.yml
@@ -0,0 +1,7 @@
+---
+- name: Execute nodetool repair on Cassandra nodes after updating
+  hosts: ds
+  gather_facts: no
+  serial: 1
+  roles:
+  - { role: apigee-opdk-cassandra-rebuild }
diff --git a/requirements.yml b/requirements.yml
index d846357..bf48bef 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -3,6 +3,8 @@
 
 - src: https://github.com/carlosfrias/apigee-opdk-cassandra-repair.git
 
+- src: https://github.com/carlosfrias/apigee-opdk-cassandra-rebuild.git
+
 - src: https://github.com/carlosfrias/apigee-opdk-stop-components.git
 
 - src: https://github.com/carlosfrias/apigee-opdk-cassandra-shutdown-preparation.git
diff --git a/update-replication-factor.yml b/update-replication-factor.yml
index f7d4863..e6b4fd6 100644
--- a/update-replication-factor.yml
+++ b/update-replication-factor.yml
@@ -54,9 +54,13 @@
     self_server_types: ['ms']
   tags: ['restart','restart-ms']
 
-#- name: Execute nodetool repair on Cassandra nodes after updating
-#  include: repair.yml
-#  tags: ['repair']
+- name: Execute nodetool rebuild on Cassandra nodes to distribute data quickly
+  include: rebuild.yml
+  tags: ['rebuild']
+
+- name: Execute nodetool repair on Cassandra nodes after updating to verify data
+  include: repair.yml
+  tags: ['repair']
 
 - name: Change cassandra replication factor
   gather_facts: no
@@ -83,8 +87,11 @@
   roles:
   - { role: apigee-opdk-cassandra-change-replication-factor, keyspaces: '{{ cassandra_keyspaces }}' }
 
-#- name: Execute nodetool repair on Cassandra nodes after updating
-#  include: repair.yml
+- name: Execute nodetool rebuild on Cassandra nodes to distribute data quickly
+  include: rebuild.yml
+
+- name: Execute nodetool repair on Cassandra nodes after updating to verify data
+  include: repair.yml
 
 - name: Set message processor consistencylevel=LOCAL_QUORUM
   include: consistency.yml