diff --git a/smartgears/ckan_connector/templates/ckan-web.xml.j2 b/smartgears/ckan_connector/templates/ckan-web.xml.j2
index a20ce21..9df7ec3 100644
--- a/smartgears/ckan_connector/templates/ckan-web.xml.j2
+++ b/smartgears/ckan_connector/templates/ckan-web.xml.j2
@@ -9,7 +9,11 @@
 	</context-param>
 	<context-param>
 		<param-name>hostname</param-name>
-		<param-value>{{ ansible_fqdn }}</param-value>
+  {% if hostname is defined %}
+		<param-value>{{ hostname }}</param-value>
+  {% else %}
+		<param-value>{{ smartgears_hostname }}</param-value>
+  {% endif %}
 	</context-param>
 	<context-param>
 		<param-name>internalPort</param-name>