diff --git a/launch/teleop_ps3_bluetooth.launch b/launch/teleop_ps3_bluetooth.launch
index de5931b23e889f8733033c6ab4cba0da59e3a955..1a7b39d9f69b86b2024b1e49cd04d0b2e089a69b 100644
--- a/launch/teleop_ps3_bluetooth.launch
+++ b/launch/teleop_ps3_bluetooth.launch
@@ -8,7 +8,7 @@
   <arg name="twist_topic"   default="/$(arg ns)/teleop/cmd_vel"/>
   <arg name="joy_topic"     default="/$(arg ns)/joy"/>
   <arg name="run_joy"       default="true"/>
-    <arg name="device"          default="/dev/input/js0" />
+    <arg name="device"          default="/dev/input/ps3joy" />
     <arg name="joy_config_file" default="$(arg path)/config/joy.yaml" />
   <arg name="output"        default="screen" />
   <arg name="launch_prefix" default="" />
@@ -27,3 +27,4 @@
   </include>
 
 </launch>
+
diff --git a/launch/teleop_ps3_cable.launch b/launch/teleop_ps3_cable.launch
index 0ff4ce5cb2acf198efb2d10b2e42dfaf341b295b..fe571392d5f1fd3337c42ecea21d6cc038e5c5fe 100644
--- a/launch/teleop_ps3_cable.launch
+++ b/launch/teleop_ps3_cable.launch
@@ -3,25 +3,27 @@
 <launch>
 
   <arg name="ns"            default="helena" />
-  <arg name="config_file"     default="$(find iri_teleop_launch)/config/ps3_cable_teleop.yaml"/>
+  <arg name="path"          default="$(find iri_teleop_launch)"/>
+  <arg name="config_file"   default="$(arg path)/config/ps3_cable_teleop.yaml" />
   <arg name="twist_topic"   default="/$(arg ns)/teleop/cmd_vel"/>
   <arg name="joy_topic"     default="/$(arg ns)/joy"/>
-  <arg name="device"          default="/dev/input/js0" />
-  <arg name="joy_config_file" default="$(find iri_teleop_launch)/config/joy.yaml"/>
+  <arg name="run_joy"       default="true"/>
+    <arg name="device"          default="/dev/input/ps3joy" />
+    <arg name="joy_config_file" default="$(arg path)/config/joy.yaml" />
   <arg name="output"        default="screen" />
   <arg name="launch_prefix" default="" />
 
   <include file="$(find iri_teleop_launch)/launch/joystick_teleop.launch">
-    <arg name="ns"               value="$(arg name)"/>
-    <arg name="output"           value="$(arg output)"/>
-    <arg name="launch_prefix"    value="$(arg launch_prefix)"/>
+    <arg name="ns"               value="$(arg ns)"/>
+    <arg name="path"             value="$(arg path)"/>
     <arg name="config_file"      value="$(arg config_file)"/>
     <arg name="twist_topic"      value="$(arg twist_topic)"/>
     <arg name="joy_topic"        value="$(arg joy_topic)"/>
-    <arg name="run_joy"          value="true"/>
-    <arg name="device"           value="$(arg device)" />
+    <arg name="run_joy"          value="$(arg run_joy)"/>
+    <arg name="device"           value="$(arg device)"/>
     <arg name="joy_config_file"  value="$(arg joy_config_file)"/>
+    <arg name="output"           value="$(arg output)"/>
+    <arg name="launch_prefix"    value="$(arg launch_prefix)"/>
   </include>
 
 </launch>
-