diff --git a/README.rst b/README.rst
index dac41c7..561e785 100644
--- a/README.rst
+++ b/README.rst
@@ -565,6 +565,7 @@
       compute:
         version: 2.2
         enabled: True
+        hostname: node-12.domain.tld
         discovery:
           host: 127.0.0.1
         interface:
diff --git a/opencontrail/files/2.2/contrail-vrouter-agent.conf b/opencontrail/files/2.2/contrail-vrouter-agent.conf
index b33d034..0e4f1fc 100644
--- a/opencontrail/files/2.2/contrail-vrouter-agent.conf
+++ b/opencontrail/files/2.2/contrail-vrouter-agent.conf
@@ -29,6 +29,9 @@
 # Hostname of compute-node. If this is not configured value from `hostname`
 # will be taken
 # hostname=
+{%- if compute.hostname is defined %}
+hostname={{ compute.hostname }}
+{%- endif %}
 
 # Http server port for inspecting vnswad state (useful for debugging)
 # http_server_port=8085
@@ -181,4 +184,4 @@
 
 # Timeout for each netns command, when the timeout is reached, the netns
 # command is killed.
-#netns_timeout=30
\ No newline at end of file
+#netns_timeout=30
diff --git a/opencontrail/files/3.0/contrail-vrouter-agent.conf b/opencontrail/files/3.0/contrail-vrouter-agent.conf
index 9aadf56..366a59b 100644
--- a/opencontrail/files/3.0/contrail-vrouter-agent.conf
+++ b/opencontrail/files/3.0/contrail-vrouter-agent.conf
@@ -42,6 +42,9 @@
 # Hostname of compute-node. If this is not configured value from `hostname`
 # will be taken
 # hostname=
+{%- if compute.hostname is defined %}
+hostname={{ compute.hostname }}
+{%- endif %}
 
 # Http server port for inspecting vnswad state (useful for debugging)
 # http_server_port=8085
diff --git a/opencontrail/files/4.0/contrail-vrouter-agent.conf b/opencontrail/files/4.0/contrail-vrouter-agent.conf
index 22df53c..3ad242a 100644
--- a/opencontrail/files/4.0/contrail-vrouter-agent.conf
+++ b/opencontrail/files/4.0/contrail-vrouter-agent.conf
@@ -41,6 +41,9 @@
 
 {%- endif %}
 # hostname= # Retrieved from gethostname() or `hostname -s` equivalent
+{%- if compute.hostname is defined %}
+hostname={{ compute.hostname }}
+{%- endif %}
 
 # Http server port for inspecting vnswad state (useful for debugging)
 # http_server_port=8085