diff --git a/build/amd64-ubuntu-builder.dockerfile b/build/amd64-ubuntu-builder.dockerfile
index 20c6272..1f78647 100644
--- a/build/amd64-ubuntu-builder.dockerfile
+++ b/build/amd64-ubuntu-builder.dockerfile
@@ -12,6 +12,7 @@ RUN set -x \
        pkg-config \
        rsync \
        gdb \
+       gdbserver \
        valgrind \
   && rm -rf /var/lib/apt/lists/*
 
diff --git a/build/arm32v7-ubuntu-builder.dockerfile b/build/arm32v7-ubuntu-builder.dockerfile
index c6a12d6..295b2f2 100644
--- a/build/arm32v7-ubuntu-builder.dockerfile
+++ b/build/arm32v7-ubuntu-builder.dockerfile
@@ -14,6 +14,7 @@ RUN set -x \
        pkg-config \
        rsync \
        gdb \
+       gdbserver \
   && rm -rf /var/lib/apt/lists/*
 
 COPY src /usr/local/src