diff --git a/files/build_templates/sonic_debian_extension.j2 b/files/build_templates/sonic_debian_extension.j2
index 37fcfbc56fcb..0159be571f88 100644
--- a/files/build_templates/sonic_debian_extension.j2
+++ b/files/build_templates/sonic_debian_extension.j2
@@ -120,6 +120,11 @@ sudo cp $IMAGE_CONFIGS/interfaces/*.j2 $FILESYSTEM_ROOT/usr/share/sonic/template
 # Copy initial interfaces configuration file, will be overwritten on first boot
 sudo cp $IMAGE_CONFIGS/interfaces/init_interfaces $FILESYSTEM_ROOT/etc/network
 
+# Copy hostname configuration scripts
+sudo cp $IMAGE_CONFIGS/hostname/hostname-config.service  $FILESYSTEM_ROOT/etc/systemd/system/
+sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable hostname-config.service
+sudo cp $IMAGE_CONFIGS/hostname/hostname-config.sh $FILESYSTEM_ROOT/usr/bin/
+
 # Copy updategraph script and service file
 sudo cp $IMAGE_CONFIGS/updategraph/updategraph.service  $FILESYSTEM_ROOT/etc/systemd/system/
 sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable updategraph.service
diff --git a/files/image_config/hostname/hostname-config.service b/files/image_config/hostname/hostname-config.service
new file mode 100644
index 000000000000..e6e8f489883f
--- /dev/null
+++ b/files/image_config/hostname/hostname-config.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Update hostname based on configdb
+Requires=database.service
+After=database.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/hostname-config.sh
+
+[Install]
+WantedBy=multi-user.target
diff --git a/files/image_config/hostname/hostname-config.sh b/files/image_config/hostname/hostname-config.sh
new file mode 100755
index 000000000000..eec7c2f732dc
--- /dev/null
+++ b/files/image_config/hostname/hostname-config.sh
@@ -0,0 +1,11 @@
+#!/bin/bash -e
+
+CURRENT_HOSTNAME=`hostname`
+HOSTNAME=`sonic-cfggen -d -v DEVICE_METADATA[\'localhost\'][\'hostname\']`
+
+echo $HOSTNAME > /etc/hostname
+hostname -F /etc/hostname
+
+sed -i "/\s$CURRENT_HOSTNAME$/d" /etc/hosts
+echo "127.0.0.1 $HOSTNAME" >> /etc/hosts
+