diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index d6b96ba..5bbcf26 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.2
 ARG ROS_DISTRO="rolling"
-FROM ros:${ROS_DISTRO}-ros-base AS system
+FROM osrf/ros2:testing AS system
 # Restate for later use
 ARG ROS_DISTRO
 RUN rm /ros_entrypoint.sh
@@ -8,9 +8,6 @@ RUN rm /ros_entrypoint.sh
 # prevent interactive messages in apt install
 ARG DEBIAN_FRONTEND=noninteractive
 
-# Switch to ros-testing
-RUN echo "deb http://packages.ros.org/ros2-testing/ubuntu $(lsb_release -cs) main" | tee /etc/apt/sources.list.d/ros2-latest.list
-
 # install build dependencies
 RUN --mount=type=cache,target=/var/cache/apt,id=apt \
     apt-get update && apt-get upgrade -y --with-new-pkgs \