diff --git a/deploy.tf b/deploy.tf
index db58a8e268b77744c518a6770ff85a94f31f6379..4b047ba5a47ffd503c70099022b9b06a548ad399 100644
--- a/deploy.tf
+++ b/deploy.tf
@@ -97,7 +97,7 @@ resource "local_file" "localkey" {
 
 resource "openstack_compute_instance_v2" "server" {
 	count = var.n + 1
-	name = data.template_file.user_data_common[count.index].vars.host
+	name = format("%s.%s", data.template_file.user_data_common[count.index].vars.host, var.domain)
 	flavor_name = var.flavor
 	image_name = var.image
 	key_pair = var.ssh
@@ -125,7 +125,7 @@ EOF
 
 resource "openstack_blockstorage_volume_v3" "volume" {
 	count = var.volumes * var.n
-	name  = format("%s%s", data.template_file.user_data_common[floor(count.index / var.volumes) + 1].vars.host, local.ord[count.index % var.volumes])
+	name  = format("%s%s.%s", data.template_file.user_data_common[floor(count.index / var.volumes) + 1].vars.host, local.ord[count.index % var.volumes], var.domain)
 	size  = var.volume_size
 }
 
@@ -164,7 +164,7 @@ output "config" {
 output "hosts" {
 	value = {
 		for instance in openstack_compute_instance_v2.server:
-			instance.name => length(instance.network) >= 1 ? instance.network[0].fixed_ip_v4 : null
+			data.template_file.user_data_common[index(openstack_compute_instance_v2.server[*].id, instance.id)].vars.host => length(instance.network) >= 1 ? instance.network[0].fixed_ip_v4 : null
 	}
 }