diff --git a/hosts/chelsty-ha/host.yaml b/hosts/chelsty-ha/host.yaml
index 2a99047..bf60cae 100644
--- a/hosts/chelsty-ha/host.yaml
+++ b/hosts/chelsty-ha/host.yaml
@@ -1,4 +1,5 @@
 hostname: chelsty-ha
+os_hostname: chelsty-ha
 site: chelsty
 
 roles:
diff --git a/hosts/chelsty-infra/host.yaml b/hosts/chelsty-infra/host.yaml
index 9a6aa7d..5afdf67 100644
--- a/hosts/chelsty-infra/host.yaml
+++ b/hosts/chelsty-infra/host.yaml
@@ -1,4 +1,5 @@
 hostname: chelsty-infra
+os_hostname: chelsty-infra
 site: chelsty
 
 roles:
diff --git a/hosts/piha/host.yaml b/hosts/piha/host.yaml
index 56c488b..8d80c6e 100644
--- a/hosts/piha/host.yaml
+++ b/hosts/piha/host.yaml
@@ -1,4 +1,5 @@
 hostname: piha
+os_hostname: piha
 
 roles:
   - infra
diff --git a/hosts/saturn/host.yaml b/hosts/saturn/host.yaml
index 583b64a..19416fa 100644
--- a/hosts/saturn/host.yaml
+++ b/hosts/saturn/host.yaml
@@ -1,4 +1,5 @@
 hostname: saturn
+os_hostname: saturn
 
 roles:
   - control
diff --git a/hosts/solaria/host.yaml b/hosts/solaria/host.yaml
index c6d5538..3b56045 100644
--- a/hosts/solaria/host.yaml
+++ b/hosts/solaria/host.yaml
@@ -1,4 +1,5 @@
 hostname: solaria
+os_hostname: solaria
 
 roles:
   - compute
diff --git a/hosts/vps/host.yaml b/hosts/vps/host.yaml
index f19dbea..a96aafc 100644
--- a/hosts/vps/host.yaml
+++ b/hosts/vps/host.yaml
@@ -1,4 +1,5 @@
 hostname: vps
+os_hostname: ubuntu-4gb-hel1-1
 
 roles:
   - edge