diff --git a/ansible/roles/swift/tasks/do_reconfigure.yml b/ansible/roles/swift/tasks/do_reconfigure.yml
index a7922d0792..3cb6ebe548 100644
--- a/ansible/roles/swift/tasks/do_reconfigure.yml
+++ b/ansible/roles/swift/tasks/do_reconfigure.yml
@@ -86,9 +86,9 @@
     action: "remove_container"
   register: remove_containers
   when:
+    - inventory_hostname in groups[item[0]['group']]
     - config_strategy == "COPY_ONCE" or item[1]['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE'
     - item[2]['rc'] == 1
-    - inventory_hostname in groups[item[0]['group']]
   with_together:
     - [{ name: swift_account_server, group: swift-account-server },
        { name: swift_account_auditor, group: swift-account-server },
@@ -118,10 +118,10 @@
     name: "{{ item[0]['name'] }}"
     action: "restart_container"
   when:
+    - inventory_hostname in groups[item[0]['group']]
     - config_strategy == 'COPY_ALWAYS'
     - item[1]['KOLLA_CONFIG_STRATEGY'] != 'COPY_ONCE'
     - item[2]['rc'] == 1
-    - inventory_hostname in groups[item[0]['group']]
   with_together:
     - [{ name: swift_account_server, group: swift-account-server },
        { name: swift_account_auditor, group: swift-account-server },