diff --git a/demo/compose.minimal-setup.yaml b/demo/compose.minimal-setup.yaml
index d93a208..a2b05af 100644
--- a/demo/compose.minimal-setup.yaml
+++ b/demo/compose.minimal-setup.yaml
@@ -30,6 +30,7 @@ services:
       memlock:
         soft: 102400
         hard: 102400
+    stop_signal: SIGINT
     command: >
       ros2 launch panther_bringup bringup.launch.py namespace:=panther
 
@@ -39,6 +40,7 @@ services:
     <<: *common-config
     devices:
       - /dev/input/js0
+    stop_signal: SIGINT
     command: >
       bash -c
       "ros2 launch
diff --git a/demo/compose.rviz.yaml b/demo/compose.rviz.yaml
index 6129929..fa5419e 100644
--- a/demo/compose.rviz.yaml
+++ b/demo/compose.rviz.yaml
@@ -17,7 +17,7 @@ x-gpu-config:
 
 services:
   rviz:
-    image: husarion/rviz2:humble
+    image: husarion/rviz2:humble-nightly
     container_name: rviz2
     <<:
       - *common-config
@@ -25,3 +25,4 @@ services:
     volumes:
       - /tmp/.X11-unix:/tmp/.X11-unix:rw
       - ./panther.rviz:/root/.rviz2/default.rviz
+    stop_signal: SIGINT
diff --git a/demo/compose.simulation.yaml b/demo/compose.simulation.yaml
index 7ed5026..b0a9d3f 100644
--- a/demo/compose.simulation.yaml
+++ b/demo/compose.simulation.yaml
@@ -17,12 +17,13 @@ x-gpu-config:
 
 services:
   panther_gazebo:
-    image: husarion/panther-gazebo:humble
+    image: husarion/panther-gazebo:humble-2.0.0-20240402
     container_name: panther_gazebo
     <<:
       - *common-config
       - *cpu-config
     volumes:
       - /tmp/.X11-unix:/tmp/.X11-unix:rw
+    stop_signal: SIGINT
     command: >
       ros2 launch panther_gazebo simulation.launch.py