diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh
index d97baf4b..65359d54 100755
--- a/devstack-vm-gate-wrap.sh
+++ b/devstack-vm-gate-wrap.sh
@@ -224,8 +224,12 @@ function cleanup_host {
 
     sudo cp /var/log/syslog $WORKSPACE/logs/syslog.txt
     sudo cp /var/log/kern.log $WORKSPACE/logs/kern_log.txt
-    sudo mkdir $WORKSPACE/logs/rabbitmq/
+    mkdir $WORKSPACE/logs/rabbitmq/
     sudo cp /var/log/rabbitmq/* $WORKSPACE/logs/rabbitmq/
+    mkdir $WORKSPACE/logs/sudoers.d/
+
+    sudo cp /etc/sudoers.d/* $WORKSPACE/logs/sudoers.d/
+    sudo cp /etc/sudoers $WORKSPACE/logs/sudoers.txt
 
     if [ -d $BASE/old ]; then
       mkdir -p $WORKSPACE/logs/old/
@@ -249,6 +253,7 @@ function cleanup_host {
     sudo chmod a+r $WORKSPACE/logs/
 
     rename 's/\.log$/.txt/' $WORKSPACE/logs/*
+    rename 's/(.*)/$1.txt/' $WORKSPACE/logs/sudoers.d/*
     rename 's/\.log$/.txt/' $WORKSPACE/logs/rabbitmq/*
     mv $WORKSPACE/logs/rabbitmq/startup_log \
        $WORKSPACE/logs/rabbitmq/startup_log.txt