diff --git a/changes.xml b/changes.xml
index f8e96e7..26703d5 100644
--- a/changes.xml
+++ b/changes.xml
@@ -23,6 +23,12 @@
xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
+
+
+ Dynamically generate X-Vhost value.
+
+
+
Role aem-dispatcher-cloud: Sync with default dispatcher configuration from Adobe AEM project archetype 40 to 47.
diff --git a/conga-aem-definitions/src/main/templates/aem-dispatcher-ams/conf.d/available_vhosts/tenant.vhost.partials.hbs b/conga-aem-definitions/src/main/templates/aem-dispatcher-ams/conf.d/available_vhosts/tenant.vhost.partials.hbs
index 9266439..ac06830 100644
--- a/conga-aem-definitions/src/main/templates/aem-dispatcher-ams/conf.d/available_vhosts/tenant.vhost.partials.hbs
+++ b/conga-aem-definitions/src/main/templates/aem-dispatcher-ams/conf.d/available_vhosts/tenant.vhost.partials.hbs
@@ -45,9 +45,11 @@ CustomLog logs/vhost_{{tenant}}_access.log {{httpd.logging.accessLogFormat}}
{{~#block "generalSettings"}}
# Use a document root that matches the one in conf.dispatcher.d/default.farm
DocumentRoot "${PUBLISH_DOCROOT}"
-# Add header breadcrumbs for help in troubleshooting
- Header add X-Vhost "publish"
+ # Add header breadcrumbs for help in troubleshooting
+{{#httpdCloudManagerConditional}}
+ Header add X-Vhost "{{httpd.serverName}}"
+{{/httpdCloudManagerConditional}}
# Webserver in AEM cloud service is always terminated with SSL
RequestHeader set X-Forwarded-SSL "on"
diff --git a/conga-aem-definitions/src/main/templates/aem-dispatcher-cloud/conf.d/available_vhosts/tenant.vhost.partials.hbs b/conga-aem-definitions/src/main/templates/aem-dispatcher-cloud/conf.d/available_vhosts/tenant.vhost.partials.hbs
index c4978f5..c27a2fe 100644
--- a/conga-aem-definitions/src/main/templates/aem-dispatcher-cloud/conf.d/available_vhosts/tenant.vhost.partials.hbs
+++ b/conga-aem-definitions/src/main/templates/aem-dispatcher-cloud/conf.d/available_vhosts/tenant.vhost.partials.hbs
@@ -34,9 +34,11 @@ ServerAlias {{this}}
DocumentRoot "${DOCROOT}"
# URI dereferencing algorithm is applied at Sling's level, do not decode parameters here
AllowEncodedSlashes NoDecode
-# Add header breadcrumbs for help in troubleshooting
- Header add X-Vhost "publish"
+ # Add header breadcrumbs for help in troubleshooting
+{{#httpdCloudManagerConditional}}
+ Header add X-Vhost "{{httpd.serverName}}"
+{{/httpdCloudManagerConditional}}
# Webserver in AEM cloud service is always terminated with SSL
RequestHeader set X-Forwarded-SSL "on"