diff --git a/tasks/setup.yml b/tasks/setup.yml
index db27eaa..ac19421 100644
--- a/tasks/setup.yml
+++ b/tasks/setup.yml
@@ -15,7 +15,7 @@
 
 - name: Wait for instance creation to complete
   async_status:
-    jid: "{{ server.ansible_job_id }}"
+    jid: "{{ __hcloud_server.ansible_job_id }}"
   register: __hcloud_job
   until: hcloud_job.finished
   retries: 300
@@ -28,7 +28,7 @@
       'ipv4': "{{ __hcloud_job.hcloud_server.ipv4_address }}",
       'ipv6': "{{ __hcloud_job.hcloud_server.ipv6 }}",
     }
-  when: server.changed | bool
+  delegate_to: localhost
 
 - name: Create volumes
   hcloud_volume: