diff --git a/lib/containers/bats.pm b/lib/containers/bats.pm
index 30623cdfaec0..fd17c9eede08 100644
--- a/lib/containers/bats.pm
+++ b/lib/containers/bats.pm
@@ -212,32 +212,26 @@ sub bats_post_hook {
 
     select_serial_terminal;
 
-    assert_script_run "cd /";
-    script_run "rm -rf $test_dir";
-
-    script_run('findmnt > /tmp/findmnt.txt');
-    upload_logs('/tmp/findmnt.txt');
-
-    script_run('df -h > /tmp/df-h.txt');
-    upload_logs('/tmp/df-h.txt');
-
-    script_run('dmesg > /tmp/dmesg.txt');
-    upload_logs('/tmp/dmesg.txt');
-
-    script_run('rpm -qa | sort > /tmp/rpm-qa.txt');
-    upload_logs('/tmp/rpm-qa.txt');
+    my $log_dir = "/tmp/logs/";
+    assert_script_run "mkdir $log_dir";
+    assert_script_run "cd $log_dir";
 
-    script_run('systemctl > /tmp/systemctl.txt');
-    upload_logs('/tmp/systemctl.txt');
-
-    script_run('systemctl status > /tmp/systemctl-status.txt');
-    upload_logs('/tmp/systemctl-status.txt');
-
-    script_run('systemctl list-unit-files > /tmp/systemctl_units.txt');
-    upload_logs('/tmp/systemctl_units.txt');
+    script_run "rm -rf $test_dir";
 
-    script_run('journalctl -b > /tmp/journalctl-b.txt', timeout => 120);
-    upload_logs('/tmp/journalctl-b.txt');
+    script_run('df -h > df-h.txt');
+    script_run('dmesg > dmesg.txt');
+    script_run('findmnt > findmnt.txt');
+    script_run('rpm -qa | sort > rpm-qa.txt');
+    script_run('systemctl > systemctl.txt');
+    script_run('systemctl status > systemctl-status.txt');
+    script_run('systemctl list-unit-files > systemctl_units.txt');
+    script_run('journalctl -b > journalctl-b.txt', timeout => 120);
+    script_run('tar zcf containers-conf.tgz $(find /etc/containers /usr/share/containers -type f)');
+
+    my @logs = split /\s+/, script_output "ls";
+    for my $log (@logs) {
+        upload_logs($log_dir . $log);
+    }
 
     upload_logs('/var/log/audit/audit.log', log_name => "audit.txt");
 }