diff --git a/builder/image-ros.sh b/builder/image-ros.sh
index 9f1913c5..e77d5cd3 100755
--- a/builder/image-ros.sh
+++ b/builder/image-ros.sh
@@ -192,7 +192,7 @@ cat << EOF >> /home/pi/.bashrc
 LANG='C.UTF-8'
 LC_ALL='C.UTF-8'
 ROS_DISTRO='kinetic'
-export ROS_HOSTNAME='raspberrypi.local'
+export ROS_HOSTNAME=\`hostname\`.local
 source /opt/ros/kinetic/setup.bash
 source /home/pi/catkin_ws/devel/setup.bash
 EOF