diff --git a/metal/Makefile b/metal/Makefile
index d415b09d..53363a54 100644
--- a/metal/Makefile
+++ b/metal/Makefile
@@ -1,12 +1,17 @@
 .POSIX:
 
-default: run
+default: boot cluster
 
-run:
+boot:
 	ansible-playbook \
 		--inventory hosts.yml \
 		main.yml
 
+cluster:
+	ansible-playbook \
+		--inventory hosts.yml \
+		cluster.yml
+
 shutdown:
 	ansible-playbook \
 		--inventory hosts.yml \
diff --git a/metal/main.yml b/metal/boot.yml
similarity index 70%
rename from metal/main.yml
rename to metal/boot.yml
index d0162afb..4bc6a240 100644
--- a/metal/main.yml
+++ b/metal/boot.yml
@@ -8,8 +8,3 @@
   gather_facts: no
   roles:
     - wake
-
-- name: Create Kubernetes cluster
-  hosts: metal
-  roles:
-    - k3s
diff --git a/metal/cluster.yml b/metal/cluster.yml
new file mode 100644
index 00000000..ad42d2d5
--- /dev/null
+++ b/metal/cluster.yml
@@ -0,0 +1,4 @@
+- name: Create Kubernetes cluster
+  hosts: metal
+  roles:
+    - k3s