diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl
index b7464fa8..a8249a89 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -187,6 +187,7 @@ removefrom file-libs /usr/share/*
 removefrom findutils /usr/bin/oldfind /usr/share/*
 removefrom fontconfig /usr/bin/*
 removefrom gawk /usr/bin/{igawk,pgawk} /usr/libexec/* /usr/share/*
+removefrom gdb /usr/share/* /usr/include/* /etc/gdbinit*
 removefrom gdisk /usr/share/*
 removefrom gdk-pixbuf2 /usr/share/locale*
 removefrom gfs2-utils /usr/sbin/*
diff --git a/share/runtime-install.tmpl b/share/runtime-install.tmpl
index ef0f4c81..762f5363 100644
--- a/share/runtime-install.tmpl
+++ b/share/runtime-install.tmpl
@@ -6,6 +6,8 @@ installpkg anaconda anaconda-widgets
 installpkg kexec-tools-anaconda-addon
 ## anaconda deps that aren't in the RPM
 installpkg tmux
+## for anaconda crash handling
+installpkg gdb
 ## Other available payloads
 installpkg dnf
 installpkg rpm-ostree