diff --git a/playbook.yml b/playbook.yml
index c8caa1f..9df362b 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -137,12 +137,20 @@
           src: kube-vip.j2
           dest: /var/lib/rancher/k3s/server/manifests/kube-vip.yml
 
-    - name: Initial node -- Wait for available API
-      ansible.builtin.shell:
-        cmd: "curl -k https://{{ cluster.virtualip | ansible.utils.ipaddr('address') }}:6443/livez?verbose"
-      register: api_readycheck
-      ignore_errors: yes
-      until: "{{ ( api_readycheck.stdout | from_json ).apiVersion is defined }}"
+    - block:
+
+      - name: Initial node -- Test API
+        ansible.builtin.shell:
+          cmd: "curl -k https://{{ cluster.virtualip | ansible.utils.ipaddr('address') }}:6443/livez?verbose"
+        register: api_readycheck
+        ignore_errors: yes
+
+      - name: Initial node -- Check for valid output
+        ansible.builtin.set_fact:
+          api_validoutput: "{{ ( api_readycheck.stdout | from_json ) }}"
+        ignore_errors: yes
+
+      until: api_validoutput.apiVersion is defined
       retries: 3
       delay: 30