diff --git a/test/e2e/data/infrastructure-proxmox/cluster-template-ci.yaml b/test/e2e/data/infrastructure-proxmox/cluster-template-ci.yaml
index bea69268..85594681 100644
--- a/test/e2e/data/infrastructure-proxmox/cluster-template-ci.yaml
+++ b/test/e2e/data/infrastructure-proxmox/cluster-template-ci.yaml
@@ -153,6 +153,7 @@ spec:
         owner: root:root
         permissions: "0700"
     preKubeadmCommands:
+      - echo "127.0.0.1   localhost kubernetes {{ ds.meta_data.hostname }}" >>/etc/hosts
       - /etc/kube-vip-prepare.sh
     initConfiguration:
       nodeRegistration:
diff --git a/test/e2e/suite_test.go b/test/e2e/suite_test.go
index aaa38290..5b322c78 100644
--- a/test/e2e/suite_test.go
+++ b/test/e2e/suite_test.go
@@ -192,6 +192,10 @@ var _ = SynchronizedAfterSuite(func() {
 	// After each ParallelNode.
 }, func() {
 	// After all ParallelNodes.
+	By("Dumping logs from the bootstrap cluster")
+	if err := dumpBootstrapClusterLogs(); err != nil {
+		GinkgoWriter.Printf("Failed to dump bootstrap cluster logs: %v", err)
+	}
 
 	By("Tearing down the management cluster")
 	if !skipCleanup {