diff --git a/roles/hcloud/defaults/main.yml b/roles/hcloud/defaults/main.yml
index 2c29f1f..e850c1b 100644
--- a/roles/hcloud/defaults/main.yml
+++ b/roles/hcloud/defaults/main.yml
@@ -1,3 +1,5 @@
 ---
 
 server_state: "present"
+max_retries: 15
+retry_delay: 60
diff --git a/roles/hcloud/tasks/_set_server_state.yml b/roles/hcloud/tasks/_set_server_state.yml
index 3af0778..ba674ad 100644
--- a/roles/hcloud/tasks/_set_server_state.yml
+++ b/roles/hcloud/tasks/_set_server_state.yml
@@ -1,8 +1,5 @@
 ---
 - name: "Block to handle hetzner server state in case of problems"
-  vars:
-    max_retries: "{{ max_retries | default(15) | int }}"
-    retry_delay: "{{ retry_delay | default(60) | int }}"
   block:
   - name: "Increment the retry count"
     set_fact:
@@ -54,11 +51,11 @@
       debug:
         msg: '{{ hcloud_response.msg }}'
 
-    - name: "RESCUE: wait_for between retries"
+    - name: "RESCUE: wait_for {{ retry_delay }} sec. between retries"
       wait_for:
         timeout: "{{ retry_delay }}"
       delegate_to: localhost
       become: false
 
-    - name: "Include _set_server one time again - retry_count: {{ retry_count }}"
+    - name: "Include _set_server one time again => increase retry_count"
       include_tasks: _set_server_state.yml