diff --git a/defaults/main.yml b/defaults/main.yml
index 0be89ea..f16b9d4 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,2 +1,3 @@
 ssh_host_key_type: ed25519
 ssh_ip: "{{ansible_host}}"
+ssh_host_key_state: configured
diff --git a/tasks/main.yml b/tasks/main.yml
index 310ec9c..60578d2 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,24 +1,20 @@
 ---
 
 - include: regenerate.yml
-  when:
-    ssh_host_key_state is defined
-    and ssh_host_key_state == 'regenerated'
+  when: ssh_host_key_state == 'regenerated'
 
 - include: scan.yml
-  when:
-    ssh_host_key_state is defined
-    and ssh_host_key_state == 'scanned'
+  when: ssh_host_key_state == 'scanned'
 
 - include: setup.yml
   when:
-    ssh_host_key_state is defined
-    and ssh_host_key_state == 'setup'
+    ssh_host_key_state == 'configured'
 
 - include: fetch.yml
   when:
-    not ssh_host_key_state is defined
-    or ssh_host_key_state == 'fetched'
-    or ssh_host_key_state == 'regenerated'
+    ssh_host_key_state == 'fetched'
 
 - include: save.yml
+  when:
+    ssh_host_key_state == 'configured' or
+    ssh_host_key_state == 'scanned'