diff --git a/demo/compose.gazebo.yaml b/demo/compose.gazebo.yaml
index 12ceb3a..0c0dae4 100644
--- a/demo/compose.gazebo.yaml
+++ b/demo/compose.gazebo.yaml
@@ -16,7 +16,7 @@ x-gpu-config:
 
 services:
   panther:
-    image: husarion/panther-gazebo:humble-ros2-update
+    image: husarion/panther-gazebo:humble
     # build:
     #   context: ..
     #   dockerfile: Dockerfile.simulation
diff --git a/demo/compose.rviz.yaml b/demo/compose.rviz.yaml
index 1bdcf92..092cb91 100644
--- a/demo/compose.rviz.yaml
+++ b/demo/compose.rviz.yaml
@@ -3,6 +3,8 @@ x-common-config:
   network_mode: host
   ipc: host
   restart: always
+  environment:
+    - RMW_IMPLEMENTATION=rmw_cyclonedds_cpp # TODO: Fix Default FastDDS
 
 x-cpu-config:
   &cpu-config
diff --git a/demo/compose.yaml b/demo/compose.yaml
index 366d4a1..f26dc66 100644
--- a/demo/compose.yaml
+++ b/demo/compose.yaml
@@ -17,10 +17,10 @@ x-gpu-config:
 
 services:
   panther:
-    # image: husarion/panther:humble
-    build:
-      context: ..
-      dockerfile: Dockerfile.hardware
+    image: husarion/panther:humble
+    # build:
+    #   context: ..
+    #   dockerfile: Dockerfile.hardware
     <<: *common-config
     devices:
       - /dev/bus/usb