diff --git a/assets/services/roscore.service b/assets/services/roscore.service
deleted file mode 100644
index c615ebd..0000000
--- a/assets/services/roscore.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Launcher for the ROS master, parameter server and rosout logging node
-
-[Service]
-User=clever
-ExecStart=/bin/sh -c ". /opt/ros/melodic/setup.sh; ROS_HOSTNAME=`hostname`.local exec roscore"
-Restart=on-failure
-RestartSec=3
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file
diff --git a/ros_ide_vm.json b/ros_ide_vm.json
index ccdc685..dc3d818 100644
--- a/ros_ide_vm.json
+++ b/ros_ide_vm.json
@@ -47,11 +47,6 @@
     "source": "{{user `assetsDir`}}/desktop/",
     "destination": "/home/clever/Desktop"
   },
-  {
-    "type": "file",
-    "source": "{{user `assetsDir`}}/services/",
-    "destination": "/etc/systemd/system"
-  },
   {
     "type": "shell",
     "script": "scripts/installSoftware.sh",
diff --git a/scripts/installSoftware.sh b/scripts/installSoftware.sh
index c853d47..b8f90c1 100644
--- a/scripts/installSoftware.sh
+++ b/scripts/installSoftware.sh
@@ -71,6 +71,8 @@ cd ${HOME}/catkin_ws && catkin_make
 echo "source /home/clever/catkin_ws/devel/setup.bash" >> ~/.bashrc
 
 echo "--- Enabling roscore service"
+sed -i "s/pi/${USER}/g" ${HOME}/catkin_ws/src/clover/builder/assets/roscore.service
+sudo cp ${HOME}/catkin_ws/src/clover/builder/assets/roscore.service /etc/systemd/system
 sudo systemctl enable roscore.service
 
 echo "--- Installing QGroundControl"