diff --git a/docker/jazzy/ros-iiwa7-webots/Dockerfile b/docker/jazzy/ros-iiwa7-webots/Dockerfile
index 059ba98..d195c64 100644
--- a/docker/jazzy/ros-iiwa7-webots/Dockerfile
+++ b/docker/jazzy/ros-iiwa7-webots/Dockerfile
@@ -5,6 +5,7 @@ ARG BUILD_TYPE=release
 
 ENV RMW_IMPLEMENTATION=rmw_cyclonedds_cpp
 ENV WEBOTS_HOME=/usr/local/webots
+ENV PIP_BREAK_SYSTEM_PACKAGES=1
 
 # X11 utilities and Mesa software renderer
 RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -27,7 +28,7 @@ RUN wget -q https://github.com/cyberbotics/webots/releases/download/R2025a/webot
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     ros-${ROS_DISTRO}-webots-ros2 \
-    ros-${ROS_DISTRO}-ros2-control \ 
+    ros-${ROS_DISTRO}-ros2-control \
     ros-${ROS_DISTRO}-ros2-controllers \
     ros-${ROS_DISTRO}-rmw-cyclonedds-cpp \
     ros-${ROS_DISTRO}-moveit \
@@ -35,7 +36,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     ros-${ROS_DISTRO}-ament-cmake-clang-format \
     ros-${ROS_DISTRO}-rosbag2-storage-mcap \
     python3-pil \
-    && rm -rf /var/lib/apt/lists/* \
+    python3-pip \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /ros2_ws
@@ -54,6 +55,7 @@ RUN echo "yaml file:///ros2_ws/rosdep.yaml" \
         > /etc/ros/rosdep/sources.list.d/50-kuka-local.list && \
     rosdep update && \
     apt-get update && \
+    pip3 install --ignore-installed "fastapi>=0.100.0" "starlette>=0.27.0" fastmcp && \
     rosdep install --from-paths src -i -r -y && \
     rm -rf /var/lib/apt/lists/*
 
diff --git a/docker/jazzy/ros-iiwa7/Dockerfile b/docker/jazzy/ros-iiwa7/Dockerfile
index 1d87d08..6262377 100644
--- a/docker/jazzy/ros-iiwa7/Dockerfile
+++ b/docker/jazzy/ros-iiwa7/Dockerfile
@@ -4,15 +4,17 @@ FROM ${IMAGE}
 ARG BUILD_TYPE=release
 
 ENV RMW_IMPLEMENTATION=rmw_cyclonedds_cpp
+ENV PIP_BREAK_SYSTEM_PACKAGES=1
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    ros-${ROS_DISTRO}-ros2-control \ 
+    ros-${ROS_DISTRO}-ros2-control \
     ros-${ROS_DISTRO}-ros2-controllers \
     ros-${ROS_DISTRO}-rmw-cyclonedds-cpp \
     ros-${ROS_DISTRO}-moveit \
     ros-${ROS_DISTRO}-moveit-py \
     ros-${ROS_DISTRO}-ament-cmake-clang-format \
     ros-${ROS_DISTRO}-rosbag2-storage-mcap \
+    python3-pip \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /ros2_ws
@@ -31,6 +33,7 @@ RUN echo "yaml file:///ros2_ws/rosdep.yaml" \
         > /etc/ros/rosdep/sources.list.d/50-kuka-local.list && \
     rosdep update && \
     apt-get update && \
+    pip3 install --ignore-installed "fastapi>=0.100.0" "starlette>=0.27.0" fastmcp && \
     rosdep install --from-paths src -i -r -y && \
     rm -rf /var/lib/apt/lists/*
 
diff --git a/rosdep.yaml b/rosdep.yaml
index 99e3258..54c02dc 100644
--- a/rosdep.yaml
+++ b/rosdep.yaml
@@ -3,11 +3,6 @@ python3-fastapi:
     pip:
       packages: ["fastapi>=0.100.0"]
 
-python3-starlette:
-  ubuntu:
-    pip:
-      packages: ["starlette>=0.27.0"]
-
 python3-uvicorn:
   ubuntu:
     pip:
diff --git a/src/iiwa_web/package.xml b/src/iiwa_web/package.xml
index a077136..45dab2e 100644
--- a/src/iiwa_web/package.xml
+++ b/src/iiwa_web/package.xml
@@ -8,7 +8,6 @@
   <license>Apache-2.0</license>
 
   <exec_depend>python3-fastapi</exec_depend>
-  <exec_depend>python3-starlette</exec_depend>
   <exec_depend>python3-uvicorn</exec_depend>
   <exec_depend>python3-multipart</exec_depend>
   <exec_depend>python3-fastmcp</exec_depend>