diff --git a/roles/etcd-restore/tasks/redhat/main.yml b/roles/etcd-restore/tasks/redhat/main.yml
index 8d802ca..f4047a7 100644
--- a/roles/etcd-restore/tasks/redhat/main.yml
+++ b/roles/etcd-restore/tasks/redhat/main.yml
@@ -6,40 +6,20 @@
 
 - include: "1-etcd-backup-file-copy.yml"
   when:
-    - "'host-master' in group_names or 'host-master-cluster' in group_names"
-    - target in ['host']
-
-- include: "1-etcd-backup-file-copy.yml"
-  when:
-    - "'member-master' in group_names or 'member-master-cluster' in group_names"
-    - target in ['member']
+    - ("host-master" in group_names or "host-master-cluster" in group_names) and target == "host" or
+      ("member-master" in group_names or "member-master-cluster" in group_names) and target == "member"
 
 - include: "2-etcd-restore.yml"
   when:
-    - "'host-master' in group_names or 'host-master-cluster' in group_names"
-    - target in ['host']
-
-- include: "2-etcd-restore.yml"
-  when:
-    - "'member-master' in group_names or 'member-master-cluster' in group_names"
-    - target in ['member']
+    - ("host-master" in group_names or "host-master-cluster" in group_names) and target == "host" or
+      ("member-master" in group_names or "member-master-cluster" in group_names) and target == "member"
 
 - include: "3-etcd-restart.yml"
   when:
-    - "'host-master' in group_names or 'host-master-cluster' in group_names"
-    - target in ['host']
-
-- include: "3-etcd-restart.yml"
-  when:
-    - "'member-master' in group_names or 'member-master-cluster' in group_names"
-    - target in ['member']
+    - ("host-master" in group_names or "host-master-cluster" in group_names) and target == "host" or
+      ("member-master" in group_names or "member-master-cluster" in group_names) and target == "member"
 
 - include: "4-kubelet-restart.yml"
   when:
-    - "'host-cluster' in group_names"
-    - target in ['host']
-
-- include: "4-kubelet-restart.yml"
-  when:
-    - "'member-cluster' in group_names"
-    - target in ['member']
\ No newline at end of file
+    - ("host-cluster" in group_names) and target == "host" or
+      ("member-cluster" in group_names) and target == "member"