diff --git a/builder/assets/init_rpi.sh b/builder/assets/init_rpi.sh
index 8054ebfd6..695051520 100755
--- a/builder/assets/init_rpi.sh
+++ b/builder/assets/init_rpi.sh
@@ -62,6 +62,10 @@ hostnamectl set-hostname $NEW_HOSTNAME
 sed -i 's/127\.0\.1\.1.*/127.0.1.1\t'${NEW_HOSTNAME}' '${NEW_HOSTNAME}'.local/g' /etc/hosts
 # .local (mdns) hostname added to make it accesable when wlan and ethernet interfaces are down
 
+echo_stamp "Enable ROS services"
+systemctl enable roscore
+systemctl enable clover
+
 echo_stamp "Harware setup"
 /root/hardware_setup.sh
 
diff --git a/builder/image-ros.sh b/builder/image-ros.sh
index fef4aec39..9de629fdd 100755
--- a/builder/image-ros.sh
+++ b/builder/image-ros.sh
@@ -100,10 +100,6 @@ my_travis_retry pip install -r /home/pi/catkin_ws/src/clover/clover/requirements
 source /opt/ros/melodic/setup.bash
 catkin_make -j2 -DCMAKE_BUILD_TYPE=Release
 
-echo_stamp "Enable ROS services"
-systemctl enable roscore
-systemctl enable clover
-
 echo_stamp "Install clever package (for backwards compatibility)"
 cd /home/pi/catkin_ws/src/clover/builder/assets/clever
 ./setup.py install