diff --git a/deploy/clever.service b/deploy/clever.service
index b0de6020..4939ed29 100644
--- a/deploy/clever.service
+++ b/deploy/clever.service
@@ -1,11 +1,11 @@
 [Unit]
-Description=Launcher for the ROS master, parameter server and rosout logging node
-Requires=roscore
+Description=Clever ROS package
+Requires=roscore.service
 After=roscore
 
 [Service]
 EnvironmentFile=/home/pi/catkin_ws/src/clever/deploy/roscore.env
-ExecStart=/opt/ros/kinetic/bin/roslaunch clever clever.launch
+ExecStart=/opt/ros/kinetic/bin/roslaunch clever clever.launch --wait
 Restart=on-abort
 
 [Install]