diff --git a/tests/packer/builds.pkr.hcl b/tests/packer/builds.pkr.hcl
index 48a5fafb6..98e923fd9 100644
--- a/tests/packer/builds.pkr.hcl
+++ b/tests/packer/builds.pkr.hcl
@@ -71,10 +71,10 @@ build {
       "while [ ! -f /var/lib/cloud/instance/boot-finished ]; do echo 'Waiting for Cloud-Init...'; sleep 20; done",
 
       # Ensure cloud-init is successful
-      # "cloud-init status",
+      "cloud-init status || cloud-init collect-logs --tarfile /root/cloud-init.tar.gz",
 
       # Remove logs and artifacts so cloud-init can re-run
-      # "cloud-init clean",
+      "cloud-init clean || true",
 
       # Install local files and config
       "bash /tmp/init.sh",
diff --git a/tests/packer/clean.sh b/tests/packer/clean.sh
index f7518a2f6..23c587d4f 100644
--- a/tests/packer/clean.sh
+++ b/tests/packer/clean.sh
@@ -60,8 +60,7 @@ clean_pacman() {
 
 clean_zypper() {
 	_msg "Cleaning zypper cache"
-	zypper update -y
-	zypper clean -y
+	zypper clean --all
 }
 
 # Make the image as impersonal as possible.