diff --git a/.devcontainer/.gdbinit b/.devcontainer/.gdbinit
new file mode 100644
index 000000000..4e92a256f
--- /dev/null
+++ b/.devcontainer/.gdbinit
@@ -0,0 +1 @@
+source /root/gdbpg.py
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index d9150ae69..40f971b1d 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -180,5 +180,10 @@ RUN sudo chown --from=root:root citus:citus -R ~
 # sets default pg version
 RUN pgenv switch 16beta3
 
+USER root
+RUN curl -o /root/gdbpg.py https://raw.githubusercontent.com/tvesely/gdbpg/master/gdbpg.py
+COPY .gdbinit /root/
+USER citus
+
 # make connecting to the coordinator easy
 ENV PGPORT=9700