diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 849e7ae3..76447230 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -115,6 +115,7 @@ EOF
         echo "VIRT_DRIVER=ironic" >>localrc
         echo "IRONIC_BAREMETAL_BASIC_OPS=True" >>localrc
         echo "IRONIC_VM_EPHEMERAL_DISK=1" >>localrc
+        echo "IRONIC_VM_LOG_DIR=$BASE/$LOCALRC_OLDNEW/ironic-bm-logs" >>localrc
         echo "DEFAULT_INSTANCE_TYPE=baremetal" >>localrc
     fi
 
diff --git a/functions.sh b/functions.sh
index d3f79fff..6645e3ce 100644
--- a/functions.sh
+++ b/functions.sh
@@ -561,6 +561,12 @@ function cleanup_host {
         sudo cp $BASE/status/stack/*.failure $BASE/logs/status/
     fi
 
+    # Copy Ironic nodes console logs if they exist
+    if [ -d $BASE/new/ironic-bm-logs ] ; then
+      sudo mkdir -p $BASE/logs/ironic-bm-logs
+      sudo cp $BASE/new/ironic-bm-logs/*.log $BASE/logs/ironic-bm-logs/
+    fi
+
     # Copy tempest config file
     sudo cp $BASE/new/tempest/etc/tempest.conf $NEWLOGTARGET/tempest_conf.txt