diff --git a/files/build_templates/docker_image_ctl.j2 b/files/build_templates/docker_image_ctl.j2
index c2d227b43522..79319e84ab2d 100644
--- a/files/build_templates/docker_image_ctl.j2
+++ b/files/build_templates/docker_image_ctl.j2
@@ -5,6 +5,15 @@ function getMountPoint()
     echo $1 | python -c "import sys, json, os; mnts = [x for x in json.load(sys.stdin)[0]['Mounts'] if x['Destination'] == '/usr/share/sonic/hwsku']; print '' if len(mnts) == 0 else os.path.basename(mnts[0]['Source'])" 2>/dev/null
 }
 
+function updateHostName()
+{
+    HOSTNAME=`hostname`
+
+    echo "Set hostname in {{docker_container_name}} container"
+    docker exec -i {{docker_container_name}} bash -c "hostname $HOSTNAME"
+    docker exec -i {{docker_container_name}} bash -c "echo \"$HOSTNAME\" > /etc/host"
+}
+
 function getBootType()
 {
     local BOOT_TYPE
@@ -81,9 +90,8 @@ function postStartAction()
     fi
 {%- elif docker_container_name == "snmp" %}
     docker exec -i database redis-cli -n 6 HSET 'DEVICE_METADATA|localhost' chassis_serial_number $(decode-syseeprom -s)
-{%- else %}
-    : # nothing
 {%- endif %}
+    updateHostName
 }
 
 start() {