diff --git a/app/docker/models/template.js b/app/docker/models/template.js
index dcc00c843..a53c2f290 100644
--- a/app/docker/models/template.js
+++ b/app/docker/models/template.js
@@ -1,6 +1,7 @@
 function TemplateViewModel(data) {
   this.Type = data.type;
   this.Name = data.name;
+  this.Hostname = data.hostname;
   this.Title = data.title;
   this.Description = data.description;
   this.Note = data.note;
diff --git a/app/docker/views/templates/templates.html b/app/docker/views/templates/templates.html
index 2e5417516..5dcec4d26 100644
--- a/app/docker/views/templates/templates.html
+++ b/app/docker/views/templates/templates.html
@@ -314,6 +314,14 @@
                 <!-- !labels-input-list -->
             </div>
             <!-- !Label -->
+            <!-- hostname -->
+            <div class="form-group">
+              <label for="container_hostname" class="col-sm-2 control-label text-left">Hostname</label>
+              <div class="col-sm-10">
+                <input type="text" name="container_hostname" class="form-control" ng-model="state.selectedTemplate.Hostname" placeholder="leave empty to use docker default">
+              </div>
+            </div>
+            <!-- !hostname -->
           </div>
           <!-- !advanced-options -->
           <!-- actions -->
diff --git a/app/portainer/services/templateService.js b/app/portainer/services/templateService.js
index d6518a6fa..57ec07c2f 100644
--- a/app/portainer/services/templateService.js
+++ b/app/portainer/services/templateService.js
@@ -44,7 +44,7 @@ angular.module('portainer.app')
     configuration.HostConfig.RestartPolicy = { Name: template.RestartPolicy };
     configuration.HostConfig.ExtraHosts = template.Hosts ? template.Hosts : [];
     configuration.name = containerName;
-    configuration.Hostname = containerName;
+    configuration.Hostname = template.Hostname;
     configuration.Image = template.Image;
     configuration.Env = TemplateHelper.EnvToStringArray(template.Env, containerMapping);
     configuration.Cmd = ContainerHelper.commandStringToArray(template.Command);