diff --git a/tasks/main.yml b/tasks/main.yml
index 1265ba1..12395a3 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,6 +1,6 @@
 ---
 # tasks file for apigee-opdk-extension-ds
-- name: Nodetool flush
+- name: Nodetool flush before repair
   shell: '{{ nodetool }} flush'
   environment:
     JAVA_HOME: '{{ java_home }}'
@@ -9,3 +9,8 @@
   shell: '{{ nodetool }} repair -pr'
   environment:
     JAVA_HOME: '{{ java_home }}'
+
+- name: Nodetool flush after repair
+  shell: '{{ nodetool }} flush'
+  environment:
+    JAVA_HOME: '{{ java_home }}'