diff --git a/modules/nodepool/manifests/init.pp b/modules/nodepool/manifests/init.pp
index eef0b7de05..63066a9ee3 100644
--- a/modules/nodepool/manifests/init.pp
+++ b/modules/nodepool/manifests/init.pp
@@ -24,7 +24,7 @@ class nodepool (
   $git_source_repo = 'https://git.openstack.org/openstack-infra/nodepool',
   $revision = 'master',
   $statsd_host = '',
-  $vhost_name = 'nodepool.openstack.org',
+  $vhost_name = $::fqdn,
   $image_log_document_root = '/var/log/nodepool/image',
   $enable_image_log_via_http = false,
   $environment = {},
diff --git a/modules/openstack_project/manifests/nodepool_prod.pp b/modules/openstack_project/manifests/nodepool_prod.pp
index a2b8e876f5..5393516dbf 100644
--- a/modules/openstack_project/manifests/nodepool_prod.pp
+++ b/modules/openstack_project/manifests/nodepool_prod.pp
@@ -5,6 +5,7 @@ class openstack_project::nodepool_prod(
   $mysql_password,
   $nodepool_ssh_private_key = '',
   $nodepool_template = 'openstack_project/nodepool/nodepool.yaml.erb',
+  $vhost_name = 'nodepool.openstack.org',
   $sysadmins = [],
   $statsd_host = '',
   $jenkins_api_user ='',
@@ -36,6 +37,7 @@ class openstack_project::nodepool_prod(
     mysql_root_password       => $mysql_root_password,
     mysql_password            => $mysql_password,
     nodepool_ssh_private_key  => $nodepool_ssh_private_key,
+    vhost_name                => $vhost_name,
     statsd_host               => $statsd_host,
     image_log_document_root   => $image_log_document_root,
     enable_image_log_via_http => $enable_image_log_via_http,