diff --git a/consistency.yml b/consistency.yml
index 4146711..5a2450c 100644
--- a/consistency.yml
+++ b/consistency.yml
@@ -8,5 +8,5 @@
     - { key: conf_keymanagement_kms_cache_memory_element_enable, value: '{{ enable_cache }}', file_name: '{{ property_file }}' }
   roles:
   - { role: apigee-opdk-cassandra-consistencylevel-modifier }
-  - { role: apigee-opdk-cwc-update }
+  - { role: apigee-opdk-cwc-update, tags: ["update_cache"] }
 
diff --git a/setup-ha-proxy.yml b/setup-ha-proxy.yml
index db3800e..dbba50c 100644
--- a/setup-ha-proxy.yml
+++ b/setup-ha-proxy.yml
@@ -21,6 +21,11 @@
   - ansible-role-haproxy
 
   tasks:
+  - name: Install http-tools
+    yum:
+      name: http-tools
+      state: present
+
   - name: Use haproxy
     ignore_errors: yes
     connection: local
diff --git a/update-replication-factor.yml b/update-replication-factor.yml
index 9b33757..f7d4863 100644
--- a/update-replication-factor.yml
+++ b/update-replication-factor.yml
@@ -54,9 +54,9 @@
     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 repair on Cassandra nodes after updating
+#  include: repair.yml
+#  tags: ['repair']
 
 - name: Change cassandra replication factor
   gather_facts: no
@@ -83,8 +83,26 @@
   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 repair on Cassandra nodes after updating
+#  include: repair.yml
+
+- name: Set message processor consistencylevel=LOCAL_QUORUM
+  include: consistency.yml
+  tags: ['local-quorum', 'local-quorum-rmp']
+  vars:
+    hosts: rmp
+    consistency_level: 'LOCAL_QUORUM'
+    property_file: 'message-processor'
+    enable_cache: 'false'
+
+- name: Set management server consistencylevel=LOCAL_QUORUM
+  include: consistency.yml
+  tags: ['local-quorum', 'local-quorum-ms']
+  vars:
+    hosts: ms
+    consistency_level: 'LOCAL_QUORUM'
+    property_file: 'management-server'
+    enable_cache: 'false'
 
 - name: Rolling restart of RMP
   include: rolling-restart.yml
@@ -100,24 +118,6 @@
     component: 'edge-management-server'
     self_server_types: ['ms']
 
-- name: Set message processor consistencylevel=LOCAL_QUORUM
-  include: consistency.yml
-  tags: ['local-quorum', 'local-quorum-rmp']
-  vars:
-    hosts: rmp
-    consistency_level: 'LOCAL_QUORUM'
-    property_file: 'message-processor'
-    enable_cache: 'true'
-
-- name: Set management server consistencylevel=LOCAL_QUORUM
-  include: consistency.yml
-  tags: ['local-quorum', 'local-quorum-ms']
-  vars:
-    hosts: ms
-    consistency_level: 'LOCAL_QUORUM'
-    property_file: 'management-server'
-    enable_cache: 'true'
-
 - name: Download logs and configs from dc-1-ds
   include: opdk-setup-log-files.yml
   vars: