diff --git a/defaults/main.yml b/defaults/main.yml
index f080a53..b0e9d73 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -13,6 +13,10 @@ vm_id: 150
 # Hostname for the base VM (template)
 hostname: debian-template-base
 
+# optional fqdn
+# fqdn: myvm.example.com
+
+
 # Memory in MB
 memory: 2048
 
diff --git a/tasks/configure-vm.yml b/tasks/configure-vm.yml
index 45760d7..c28c44a 100644
--- a/tasks/configure-vm.yml
+++ b/tasks/configure-vm.yml
@@ -156,7 +156,6 @@
         qm set {{ vm_id }}
         --ciuser {{ ci_user }}
         --sshkeys local:snippets/{{ vm_id }}-sshkey.pub
-        --hostname {{ hostname }}
         --citype nocloud
         --cicustom "user=local:snippets/{{ vm_id }}-user.yaml,vendor=local:snippets/{{ vm_id }}-vendor.yaml"
         --ipconfig0 {{ ipconfig0 }}
diff --git a/templates/cloudinit_userdata.yaml.j2 b/templates/cloudinit_userdata.yaml.j2
index 5dfdfae..af6e6e4 100644
--- a/templates/cloudinit_userdata.yaml.j2
+++ b/templates/cloudinit_userdata.yaml.j2
@@ -1,5 +1,10 @@
 #cloud-config
 
+hostname: {{ hostname }}
+{% if domain is defined and domain %}
+fqdn: {{ hostname }}.{{ domain }}
+{% endif %}
+
 users:
   - name: {{ ci_user }}
     sudo: ALL=(ALL) NOPASSWD:ALL