diff --git a/pkg/controller/build/buildrequest/buildrequest.go b/pkg/controller/build/buildrequest/buildrequest.go
index 82546b224f..7e89e93655 100644
--- a/pkg/controller/build/buildrequest/buildrequest.go
+++ b/pkg/controller/build/buildrequest/buildrequest.go
@@ -653,12 +653,13 @@ func (br buildRequestImpl) toBuildahPod() *corev1.Pod {
 			InitContainers: []corev1.Container{
 				{
 					// This container performs the image build / push process.
-					Name:            "image-build",
-					Image:           br.opts.Images.MachineConfigOperator,
-					Env:             env,
-					Command:         append(command, buildahBuildScript),
-					ImagePullPolicy: corev1.PullAlways,
-					SecurityContext: securityContext,
+					Name:                     "image-build",
+					Image:                    br.opts.Images.MachineConfigOperator,
+					Env:                      env,
+					Command:                  append(command, buildahBuildScript),
+					ImagePullPolicy:          corev1.PullAlways,
+					SecurityContext:          securityContext,
+					TerminationMessagePolicy: corev1.TerminationMessageFallbackToLogsOnError,
 					// Only attach the buildah-cache volume mount to the buildah container.
 					VolumeMounts: append(volumeMounts, corev1.VolumeMount{
 						Name:      "buildah-cache",
@@ -673,13 +674,14 @@ func (br buildRequestImpl) toBuildahPod() *corev1.Pod {
 					// the base OS image (which contains the "oc" binary) to create a
 					// ConfigMap from the digestfile that Buildah creates, which allows
 					// us to avoid parsing log files.
-					Name:            "create-digest-configmap",
-					Command:         append(command, digestCMScript),
-					Image:           br.opts.MachineConfig.Spec.OSImageURL,
-					Env:             env,
-					ImagePullPolicy: corev1.PullAlways,
-					SecurityContext: securityContext,
-					VolumeMounts:    volumeMounts,
+					Name:                     "create-digest-configmap",
+					Command:                  append(command, digestCMScript),
+					Image:                    br.opts.MachineConfig.Spec.OSImageURL,
+					Env:                      env,
+					ImagePullPolicy:          corev1.PullAlways,
+					SecurityContext:          securityContext,
+					TerminationMessagePolicy: corev1.TerminationMessageFallbackToLogsOnError,
+					VolumeMounts:             volumeMounts,
 				},
 			},
 			ServiceAccountName:            "machine-os-builder",