diff --git a/bindata/nodecadaemon.yaml b/bindata/nodecadaemon.yaml
index 9504e5cba1..2126aa0c47 100644
--- a/bindata/nodecadaemon.yaml
+++ b/bindata/nodecadaemon.yaml
@@ -65,6 +65,7 @@ spec:
             done
             sleep 60 & wait ${!}
           done
+        terminationMessagePolicy: FallbackToLogsOnError
         volumeMounts:
         - name: serviceca
           mountPath: /tmp/serviceca
diff --git a/manifests/07-operator-ibm-cloud-managed.yaml b/manifests/07-operator-ibm-cloud-managed.yaml
index 302a764398..fcfb2e438e 100644
--- a/manifests/07-operator-ibm-cloud-managed.yaml
+++ b/manifests/07-operator-ibm-cloud-managed.yaml
@@ -56,6 +56,7 @@ spec:
           requests:
             cpu: 10m
             memory: 50Mi
+        terminationMessagePolicy: FallbackToLogsOnError
         volumeMounts:
         - mountPath: /var/run/configmaps/trusted-ca/
           name: trusted-ca
diff --git a/manifests/07-operator.yaml b/manifests/07-operator.yaml
index 4662f51b54..af3f5986c0 100644
--- a/manifests/07-operator.yaml
+++ b/manifests/07-operator.yaml
@@ -74,6 +74,7 @@ spec:
               value: quay.io/openshift/origin-cli:v4.0
             - name: AZURE_ENVIRONMENT_FILEPATH
               value: /tmp/azurestackcloud.json
+          terminationMessagePolicy: FallbackToLogsOnError
           volumeMounts:
             - name: trusted-ca
               mountPath: /var/run/configmaps/trusted-ca/
diff --git a/pkg/resource/podtemplatespec.go b/pkg/resource/podtemplatespec.go
index 1caf1070f3..dbf6a5a748 100644
--- a/pkg/resource/podtemplatespec.go
+++ b/pkg/resource/podtemplatespec.go
@@ -510,6 +510,7 @@ func makePodTemplateSpec(coreClient coreset.CoreV1Interface, proxyLister configl
 							},
 						},
 					},
+					TerminationMessagePolicy: corev1.TerminationMessageFallbackToLogsOnError,
 				},
 			},
 			Volumes:                       volumes,