diff --git a/ansible/roles/glance/handlers/main.yml b/ansible/roles/glance/handlers/main.yml
index d2ec351ae10608df6885222a0db89a685ffe921a..c914190cb6f54bffcb939d034c119b941b83cc05 100644
--- a/ansible/roles/glance/handlers/main.yml
+++ b/ansible/roles/glance/handlers/main.yml
@@ -14,6 +14,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -37,6 +38,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
diff --git a/ansible/roles/glance/tasks/config.yml b/ansible/roles/glance/tasks/config.yml
index 49e56e80082fdd241893923feece3f5ae91f4e7e..8f8c2a0857a20adc55a80ec44b06aec7ec861206 100644
--- a/ansible/roles/glance/tasks/config.yml
+++ b/ansible/roles/glance/tasks/config.yml
@@ -68,9 +68,9 @@
     volumes: "{{ item.value.volumes }}"
   register: check_glance_containers
   when:
+    - action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
-    - action != "genconfig"
   with_dict: "{{ glance_services }}"
   notify:
     - Restart glance-api container
diff --git a/ansible/roles/heat/handlers/main.yml b/ansible/roles/heat/handlers/main.yml
index 94f0b4aa2963f5613c0e34549fe4e53c34c7b747..c85ff2b477706f39614f4b2b8e4af2a44c6b0a6c 100644
--- a/ansible/roles/heat/handlers/main.yml
+++ b/ansible/roles/heat/handlers/main.yml
@@ -14,6 +14,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -36,6 +37,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -58,6 +60,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
diff --git a/ansible/roles/heat/tasks/config.yml b/ansible/roles/heat/tasks/config.yml
index 232f04a8e5452577e160a73fb4f5fdde5139ec4e..6c22d47f5fe1ae975bf0eeabec8440f3238d9dc0 100644
--- a/ansible/roles/heat/tasks/config.yml
+++ b/ansible/roles/heat/tasks/config.yml
@@ -78,6 +78,7 @@
     volumes: "{{ item.value.volumes }}"
   register: check_heat_containers
   when:
+    - action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ heat_services }}"
diff --git a/ansible/roles/keystone/handlers/main.yml b/ansible/roles/keystone/handlers/main.yml
index 59b9168548e1cc0b6edd1db7a28a4df6e60c9638..49889e2b9128b9d87726909ae4329ff3983955f5 100644
--- a/ansible/roles/keystone/handlers/main.yml
+++ b/ansible/roles/keystone/handlers/main.yml
@@ -14,6 +14,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes|reject('equalto', '')|list }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -39,6 +40,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes|reject('equalto', '')|list }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -60,6 +62,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes|reject('equalto', '')|list }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
diff --git a/ansible/roles/keystone/tasks/config.yml b/ansible/roles/keystone/tasks/config.yml
index c818d6fe6109d4a4880f63dae99cad031b50d752..3efc8844c1d9c7867fef9b8cb71c7cfce74a2e6f 100644
--- a/ansible/roles/keystone/tasks/config.yml
+++ b/ansible/roles/keystone/tasks/config.yml
@@ -179,7 +179,7 @@
     image: "{{ item.value.image }}"
     volumes: "{{ item.value.volumes|reject('equalto', '')|list }}"
   when:
-    - action != 'genconfig'
+    - action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   register: check_keystone_containers
diff --git a/ansible/roles/memcached/handlers/main.yml b/ansible/roles/memcached/handlers/main.yml
index 1054d721bc459c29916b81381aca000994e94c81..093975864c3e969fa40bca348e8da9571d0f5703 100644
--- a/ansible/roles/memcached/handlers/main.yml
+++ b/ansible/roles/memcached/handlers/main.yml
@@ -8,6 +8,7 @@
     name: "{{ service.container_name }}"
     volumes: "{{ service.volumes }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - memcached_config_json.changed | bool
diff --git a/ansible/roles/memcached/tasks/config.yml b/ansible/roles/memcached/tasks/config.yml
index 6b008168c8a35a23f21939a8574845cd9cd8f9be..63438c6e8a1cef6b7991975d14cf93c801bc9278 100644
--- a/ansible/roles/memcached/tasks/config.yml
+++ b/ansible/roles/memcached/tasks/config.yml
@@ -29,5 +29,5 @@
   when:
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
-    - action != "genconfig"
+    - action != "config"
   notify: Restart memcached container
diff --git a/ansible/roles/searchlight/handlers/main.yml b/ansible/roles/searchlight/handlers/main.yml
index e37ec9acfa1c8132309ce6a0e307d41e23c8371a..715217dee2738ddd7b038348cf0707d6f19a1e61 100644
--- a/ansible/roles/searchlight/handlers/main.yml
+++ b/ansible/roles/searchlight/handlers/main.yml
@@ -14,6 +14,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -36,6 +37,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
diff --git a/ansible/roles/searchlight/tasks/config.yml b/ansible/roles/searchlight/tasks/config.yml
index d1f960158b699fa79b2370baab8744e6de516c3a..3e95292a2525d69aa24d6a9f2d912a8e0b253427 100644
--- a/ansible/roles/searchlight/tasks/config.yml
+++ b/ansible/roles/searchlight/tasks/config.yml
@@ -63,7 +63,7 @@
     volumes: "{{ item.value.volumes }}"
   register: check_searchlight_containers
   when:
-    - action != 'genconfig'
+    - action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ searchlight_services }}"
diff --git a/ansible/roles/senlin/handlers/main.yml b/ansible/roles/senlin/handlers/main.yml
index 9e853958010ea1ce1b44e82585c143e9c3ec65be..df0ac9c42cd1b3c6e42bd3a7a0bda673c8d1bffe 100644
--- a/ansible/roles/senlin/handlers/main.yml
+++ b/ansible/roles/senlin/handlers/main.yml
@@ -14,6 +14,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
@@ -36,6 +37,7 @@
     image: "{{ service.image }}"
     volumes: "{{ service.volumes }}"
   when:
+    - action != "config"
     - inventory_hostname in groups[service.group]
     - service.enabled | bool
     - config_json.changed | bool
diff --git a/ansible/roles/senlin/tasks/config.yml b/ansible/roles/senlin/tasks/config.yml
index 50b50419b10bf9bf980e43490358a2fae1da4f89..8b36946c5a281339fbf00ce7469148d763598d9d 100644
--- a/ansible/roles/senlin/tasks/config.yml
+++ b/ansible/roles/senlin/tasks/config.yml
@@ -69,7 +69,7 @@
     volumes: "{{ item.value.volumes }}"
   register: check_senlin_containers
   when:
-    - action != 'genconfig'
+    - action != "config"
     - inventory_hostname in groups[item.value.group]
     - item.value.enabled | bool
   with_dict: "{{ senlin_services }}"