diff --git a/templates/ros/docker/Dockerfile b/templates/ros/docker/Dockerfile
index e820c16..f2ae50c 100644
--- a/templates/ros/docker/Dockerfile
+++ b/templates/ros/docker/Dockerfile
@@ -40,6 +40,8 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update \
  && apt-get install -y \
     ack \
+    cloc \
+    gdb \
     htop \
     iperf3 \
     iputils-ping \
@@ -47,6 +49,7 @@ RUN apt-get update \
     net-tools \
     psmisc \
     python3-vcstool \
+    tmux \
  && rm -rf /var/lib/apt/lists/*
 
 RUN apt-get update \
diff --git a/templates/ros2/docker/Dockerfile b/templates/ros2/docker/Dockerfile
index 8cf4ef7..17624f6 100644
--- a/templates/ros2/docker/Dockerfile
+++ b/templates/ros2/docker/Dockerfile
@@ -45,6 +45,8 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update \
  && apt-get install -y \
     ack \
+    cloc \
+    gdb \
     htop \
     iperf3 \
     iputils-ping \
@@ -52,6 +54,7 @@ RUN apt-get update \
     net-tools \
     psmisc \
     python3-vcstool \
+    tmux \
  && rm -rf /var/lib/apt/lists/*
 
 RUN apt-get update \