diff --git a/consistency.yml b/consistency.yml
index f990f31..6a636b4 100644
--- a/consistency.yml
+++ b/consistency.yml
@@ -3,18 +3,22 @@
   hosts: '{{ hosts }}'
   gather_facts: no
   serial: 1
+  vars:
+    cwc_properties:
+    - { 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-cassandra-consistencylevel-modifier }
+  - { role: apigee-opdk-cwc-update }
 
-  tasks:
-  - name: Update conf_keymanagement_kms_cache_memory_element_enable property
-    lineinfile:
-      create: yes
-      group: "{{ opdk_group_name }}"
-      owner: "{{ opdk_user_name }}"
-      mode: 0644
-      state: present
-      regexp: "^conf_keymanagement_kms_cache_memory_element_enable"
-      line: "conf_keymanagement_kms_cache_memory_element_enable={{ enable_cache }}"
-      dest: "/opt/apigee/customer/application/{{ property_file }}.properties"
+#  tasks:
+#  - name: Update conf_keymanagement_kms_cache_memory_element_enable property
+#    lineinfile:
+#      create: yes
+#      group: "{{ opdk_group_name }}"
+#      owner: "{{ opdk_user_name }}"
+#      mode: 0644
+#      state: present
+#      regexp: "^conf_keymanagement_kms_cache_memory_element_enable"
+#      line: "conf_keymanagement_kms_cache_memory_element_enable={{ enable_cache }}"
+#      dest: "/opt/apigee/customer/application/{{ property_file }}.properties"
 
diff --git a/requirements.yml b/requirements.yml
index c702e6e..54fa552 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -25,3 +25,5 @@
 
 - src: https://github.com/carlosfrias/apigee-opdk-server-self
 
+- src: https://github.com/carlosfrias/apigee-opdk-cwc-update
+
diff --git a/setup-ha-proxy.yml b/setup-ha-proxy.yml
index 5437d7e..d47228d 100644
--- a/setup-ha-proxy.yml
+++ b/setup-ha-proxy.yml
@@ -32,4 +32,4 @@
         Host: "api.tmobile.com"
         Content-Type: "application/x-www-form-urlencoded"
       body: grant_type=client_credentials&client_id={{ client_id }}&client_secret={{ client_secret }}
-    with_sequence: start=1 end=5000
+    with_sequence: start=1 end="{{ end | default(5000) }}"