diff --git a/host_vars/apollo.archlinux.org b/host_vars/apollo.archlinux.org
index 7f194f92891a4dd78fbf301cbfb0406faea49980..e25f63df7b321690ae0e2cdb3c6bc452ce7c50a4 100644
--- a/host_vars/apollo.archlinux.org
+++ b/host_vars/apollo.archlinux.org
@@ -1,5 +1,7 @@
 ---
 
+hostname: "apollo"
+
 ipv4_address: "138.201.81.199"
 ipv4_netmask: "/32"
 ipv6_address: "2a01:4f8:172:1d86::1"
diff --git a/host_vars/orion.archlinux.org b/host_vars/orion.archlinux.org
index e7f17194d3d47dc73ce96bf84f26e050f9b11491..cdc4fa9af814eeccb38dcce6174ed1d81e9c4f27 100644
--- a/host_vars/orion.archlinux.org
+++ b/host_vars/orion.archlinux.org
@@ -1,4 +1,5 @@
 ---
+hostname: "orion"
 ipv4_address: "88.198.91.70"
 ipv4_netmask: "/32"
 ipv6_address: "2a01:4f8:160:6087::1"
diff --git a/host_vars/soyuz.archlinux.org b/host_vars/soyuz.archlinux.org
index 296072d94e2e57c37d6c48050870e2bf538b81d1..b91ca70cc2c25d5bd498de3fe260c503dfcdfa52 100644
--- a/host_vars/soyuz.archlinux.org
+++ b/host_vars/soyuz.archlinux.org
@@ -1,5 +1,5 @@
-
 ---
+hostname: "soyuz"
 ipv4_address: "138.201.206.85"
 ipv4_netmask: "/32"
 ipv6_address: "2a01:4f8:173:1654::1"
diff --git a/host_vars/vostok.archlinux.org b/host_vars/vostok.archlinux.org
index 757080bd63b3b605949adb9b5c47eb1ee8b6f177..c6efb84109975815bd941d87ccc18460193a3ae8 100644
--- a/host_vars/vostok.archlinux.org
+++ b/host_vars/vostok.archlinux.org
@@ -1,4 +1,5 @@
 ---
+hostname: "vostok"
 
 ipv4_address: "5.9.158.171"
 ipv4_netmask: "/32"
diff --git a/playbooks/apollo-provision.yml b/playbooks/apollo-provision.yml
deleted file mode 100644
index cb0a303a0fed61844972793303d0814bc6a5b6b4..0000000000000000000000000000000000000000
--- a/playbooks/apollo-provision.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-
-# This script is for provisioning a server for first boot.
-# Care: It is not idempotent by design.
-
-- name: provision apollo
-  hosts: apollo
-  remote_user: root
-  vars:
-    - hostname: apollo
-  roles:
-    - install_arch
diff --git a/playbooks/orion-provision.yml b/playbooks/install_arch.yml
similarity index 68%
rename from playbooks/orion-provision.yml
rename to playbooks/install_arch.yml
index 9137d823cbd714609e5118f52b4ce8f49a8c84b8..154d31d5f019b8b09dee17037acbde3dc15b5f27 100644
--- a/playbooks/orion-provision.yml
+++ b/playbooks/install_arch.yml
@@ -3,10 +3,8 @@
 # This script is for provisioning a server for first boot.
 # Care: It is not idempotent by design.
 
-- name: provision orion
-  hosts: orion
+- name: install_arch
+  hosts: all
   remote_user: root
-  vars:
-    - hostname: orion
   roles:
     - install_arch
diff --git a/playbooks/soyuz-provision.yml b/playbooks/soyuz-provision.yml
deleted file mode 100644
index 40d7b412ec29c7e35beb374d3bbc52c75b64bbb8..0000000000000000000000000000000000000000
--- a/playbooks/soyuz-provision.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-
-# This script is for provisioning a server for first boot.
-# Care: It is not idempotent by design.
-
-- name: provision soyuz
-  hosts: soyuz
-  remote_user: root
-  vars:
-    - hostname: soyuz
-  roles:
-    - install_arch
diff --git a/playbooks/vostok-provision.yml b/playbooks/vostok-provision.yml
deleted file mode 100644
index c2246c201827c1bc441ddcd730bee5d9f64b2f81..0000000000000000000000000000000000000000
--- a/playbooks/vostok-provision.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-
-# This script is for provisioning a server for first boot.
-# Care: It is not idempotent by design.
-
-- name: provision vostok
-  hosts: vostok
-  remote_user: root
-  vars:
-    - hostname: vostok
-  roles:
-    - install_arch