diff --git a/pyproject.toml b/pyproject.toml
index 2a1771b..058655b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "swagspace_cloud_init"
-version = "0.3.0"
+version = "0.4.0"
 description = ""
 authors = [
     {name = "Johannes Erwerle",email = "jo@swagspace.org"}
diff --git a/swagspace_cloud_init/__init__.py b/swagspace_cloud_init/__init__.py
index 136a6ca..d9ff759 100644
--- a/swagspace_cloud_init/__init__.py
+++ b/swagspace_cloud_init/__init__.py
@@ -198,6 +198,7 @@ def build_vm():
         default_interface_name=primary_interface,
     )
     user_data = build_user_data(
+        hostname=args.vm_name,
         username=args.username,
         password=password,
         target_dir=cloud_init_tempdir_path,
@@ -293,7 +294,9 @@ def get_ssh_keys(username: str) -> List[str]:
     return keys
 
 
-def build_user_data(username: str, password: str, target_dir: Path) -> Path:
+def build_user_data(
+    hostname: str, username: str, password: str, target_dir: Path
+) -> Path:
     """
     Builds the user-data file in *target_dir* and returns a Path to it.
     """
@@ -316,7 +319,12 @@ def build_user_data(username: str, password: str, target_dir: Path) -> Path:
 
     keyboard = {"layout": "de", "model": "pc105"}
 
-    user_data = {"users": users, "power_state": power_state, "keyboard": keyboard}
+    user_data = {
+        "users": users,
+        "power_state": power_state,
+        "keyboard": keyboard,
+        "hostname": hostname,
+    }
 
     target_path = target_dir / "user-data"
     with target_path.open("w+") as f: