diff --git a/Dockerfile b/Dockerfile
index 29297e9..46e787c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,17 @@
-FROM docker.io/library/ros:jazzy-ros-base
+FROM docker.io/library/ros:lyrical-ros-base
 
 # ROS deps
 RUN apt update && \
     apt install -y \
-        ros-jazzy-cv-bridge \
-        ros-jazzy-image-transport
+        ros-$ROS_DISTRO-cv-bridge \
+        ros-$ROS_DISTRO-image-transport \
+        ros-$ROS_DISTRO-diagnostic-aggregator
 
 # Image Stream Deps
 RUN apt update && \
     apt install -y \
          libgstreamer-plugins-base1.0-dev \
-         libgstreamer-plugins-good1.0-dev \
+         libgstreamer-plugins-extra1.0-dev \
          libgstreamer-plugins-bad1.0-dev \
          libgstrtspserver-1.0-dev \
          gstreamer1.0-plugins-ugly \
@@ -32,4 +33,4 @@ RUN npm install -g corepack
 RUN mkdir /opt/robot_status_ui
 WORKDIR /opt/robot_status_ui
 COPY ./src/ /opt/robot_status_ui/
-RUN . /opt/ros/jazzy/setup.sh && colcon build
+RUN . /opt/ros/$ROS_DISTRO/setup.sh && colcon build