diff --git a/Dockerfile.dev b/Dockerfile.dev
index 6c004d252..4eb8472d8 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -18,12 +18,12 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###################################################################################
@@ -47,7 +47,7 @@ RUN dnf -y install \
 	jq \
 	iproute \
 	python-pip \
-	valgrind gdb \
+	valgrind gdb gdb-gdbserver \
 	xmlto rubygem-asciidoctor
 
 # 32bit versions of some standard libraries for RT-LAB code
diff --git a/Dockerfile.dev-ubuntu b/Dockerfile.dev-ubuntu
index 461653afa..d0ee9aa79 100644
--- a/Dockerfile.dev-ubuntu
+++ b/Dockerfile.dev-ubuntu
@@ -18,12 +18,12 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ###################################################################################
@@ -50,7 +50,7 @@ RUN apt-get update && apt-get install -y \
 	jq \
 	iproute \
 	python-pip \
-	valgrind gdb \
+	valgrind gdb gdbserver \
 	xmlto asciidoctor
 
 # 32bit versions of some standard libraries for RT-LAB code