diff --git a/config/sensors_3d.yaml b/config/sensors_3d.yaml
deleted file mode 100644
index 51010a36779bb9deb49c87d378e0f5af4f4a0e54..0000000000000000000000000000000000000000
--- a/config/sensors_3d.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-sensors:
-  []
\ No newline at end of file
diff --git a/config/sensors_kinect_depthmap.yaml b/config/sensors_kinect_depthmap.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..9538fe0ac91bf6ebe587516b7d05356f5fe565a2
--- /dev/null
+++ b/config/sensors_kinect_depthmap.yaml
@@ -0,0 +1,11 @@
+sensors:
+  - sensor_plugin: occupancy_map_monitor/DepthImageOctomapUpdater
+    image_topic: /camera/depth_registered/image_raw
+    queue_size: 5
+    near_clipping_plane_distance: 0.3
+    far_clipping_plane_distance: 5.0
+    shadow_threshold: 0.2
+    padding_scale: 4.0
+    padding_offset: 0.03
+    max_update_rate: 1.0
+    filtered_cloud_topic: filtered_cloud
diff --git a/config/sensors_kinect_pointcloud.yaml b/config/sensors_kinect_pointcloud.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..92e7095a60ba5fa22d64039189caba902cbf1d21
--- /dev/null
+++ b/config/sensors_kinect_pointcloud.yaml
@@ -0,0 +1,9 @@
+sensors:
+  - sensor_plugin: occupancy_map_monitor/PointCloudOctomapUpdater
+    point_cloud_topic: /camera/depth_registered/points
+    max_range: 5.0
+    point_subsample: 1
+    padding_offset: 0.1
+    padding_scale: 1.0
+    max_update_rate: 1.0
+    filtered_cloud_topic: filtered_cloud
diff --git a/launch/sensor_manager.launch.xml b/launch/sensor_manager.launch.xml
index 17279ddde5e174f20d7c98a8273ff494f2bf5d81..61db9d9ddd376f03452c87c093d667830f5b7ae1 100644
--- a/launch/sensor_manager.launch.xml
+++ b/launch/sensor_manager.launch.xml
@@ -2,11 +2,13 @@
 
   <!-- This file makes it easy to include the settings for sensor managers -->
 
-  <!-- Params for 3D sensors config -->
-  <rosparam command="load" file="$(find panda_moveit_config)/config/sensors_3d.yaml" />
+  <!-- Params for 3D sensors config: '' | pointcloud | depthmap -->
+  <arg name="sensor_type" default="" />
+  <rosparam if="$(eval arg('sensor_type')  != '')" command="load" file="$(find panda_moveit_config)/config/sensors_kinect_$(arg sensor_type).yaml" />
 
   <!-- Params for the octomap monitor -->
   <!--  <param name="octomap_frame" type="string" value="some frame in which the robot moves" /> -->
+  <param name="octomap_frame" type="string" value="camera_rgb_optical_frame" />
   <param name="octomap_resolution" type="double" value="0.025" />
   <param name="max_range" type="double" value="5.0" />