diff --git a/Makefile b/Makefile
index 247ac07..b84a98f 100644
--- a/Makefile
+++ b/Makefile
@@ -190,7 +190,7 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified
 
 .PHONY: deploy
 deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
-	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
+	cd config/manager && $(KUSTOMIZE) edit set image quay.io/metal3-io/ironic-standalone-operator=${IMG}
 	$(KUSTOMIZE) build config/$(DEPLOY_TARGET) | kubectl apply -f -
 
 .PHONY: undeploy
diff --git a/test/collect-logs.sh b/test/collect-logs.sh
index c96e67e..adf57ec 100755
--- a/test/collect-logs.sh
+++ b/test/collect-logs.sh
@@ -4,8 +4,13 @@ set -ux
 
 LOGDIR="${LOGDIR:-/tmp/logs}"
 
-mkdir -p "${LOGDIR}"
+mkdir -p "${LOGDIR}/controller/"
 
+kubectl get -o yaml \
+    -n ironic-standalone-operator-system deployment/ironic-standalone-operator-controller-manager \
+    > "${LOGDIR}/controller/deployment.yaml"
+kubectl get pod -o yaml \
+    -n ironic-standalone-operator-system > "${LOGDIR}/controller/pods.yaml"
 kubectl logs \
     -n ironic-standalone-operator-system deployment/ironic-standalone-operator-controller-manager \
-    > "${LOGDIR}/controller.log"
+    > "${LOGDIR}/controller/manager.log"
diff --git a/test/suite_test.go b/test/suite_test.go
index 348af61..e4b5c12 100644
--- a/test/suite_test.go
+++ b/test/suite_test.go
@@ -113,6 +113,8 @@ func WaitForIronic(name types.NamespacedName) *metal3api.Ironic {
 		err := k8sClient.Get(ctx, name, ironic)
 		Expect(err).NotTo(HaveOccurred())
 
+		writeYAML(ironic, ironic.Namespace, ironic.Name, "ironic")
+
 		cond := meta.FindStatusCondition(ironic.Status.Conditions, string(metal3api.IronicStatusReady))
 		if cond != nil && cond.Status == metav1.ConditionTrue {
 			Expect(ironic.Status.InstalledVersion).ToNot(BeNil())
@@ -125,6 +127,7 @@ func WaitForIronic(name types.NamespacedName) *metal3api.Ironic {
 			deploy, err := clientset.AppsV1().DaemonSets(name.Namespace).Get(ctx, deployName, metav1.GetOptions{})
 			if err == nil {
 				GinkgoWriter.Printf(".. status of daemon set: %+v\n", deploy.Status)
+				writeYAML(deploy, deploy.Namespace, deploy.Name, "daemonset")
 			} else if !k8serrors.IsNotFound(err) {
 				Expect(err).NotTo(HaveOccurred())
 			}
@@ -132,6 +135,7 @@ func WaitForIronic(name types.NamespacedName) *metal3api.Ironic {
 			deploy, err := clientset.AppsV1().Deployments(name.Namespace).Get(ctx, deployName, metav1.GetOptions{})
 			if err == nil {
 				GinkgoWriter.Printf(".. status of deployment: %+v\n", deploy.Status)
+				writeYAML(deploy, deploy.Namespace, deploy.Name, "deployment")
 			} else if !k8serrors.IsNotFound(err) {
 				Expect(err).NotTo(HaveOccurred())
 			}