diff --git a/deploy/operator.yaml b/deploy/operator.yaml
index b6d77e9c..31cf1e63 100644
--- a/deploy/operator.yaml
+++ b/deploy/operator.yaml
@@ -11,6 +11,8 @@ spec:
     metadata:
       labels:
         name: splunk-forwarder-operator
+      annotations:
+        openshift.io/required-scc: restricted-v2
     spec:
       serviceAccountName: splunk-forwarder-operator
       affinity:
@@ -43,3 +45,4 @@ spec:
                   fieldPath: metadata.name
             - name: OPERATOR_NAME
               value: "splunk-forwarder-operator"
+          terminationMessagePolicy: FallbackToLogsOnError
diff --git a/deploy_pko/Deployment-splunk-forwarder-operator.yaml.gotmpl b/deploy_pko/Deployment-splunk-forwarder-operator.yaml.gotmpl
index ceeb5d38..9f6a61b5 100644
--- a/deploy_pko/Deployment-splunk-forwarder-operator.yaml.gotmpl
+++ b/deploy_pko/Deployment-splunk-forwarder-operator.yaml.gotmpl
@@ -15,6 +15,8 @@ spec:
     metadata:
       labels:
         name: splunk-forwarder-operator
+      annotations:
+        openshift.io/required-scc: restricted-v2
     spec:
       serviceAccountName: splunk-forwarder-operator
       affinity:
@@ -46,3 +48,4 @@ spec:
               fieldPath: metadata.name
         - name: OPERATOR_NAME
           value: splunk-forwarder-operator
+        terminationMessagePolicy: FallbackToLogsOnError