diff --git a/submariner/templates/engine-deploy.yaml b/submariner/templates/engine-deploy.yaml
index 0039709..5450dab 100644
--- a/submariner/templates/engine-deploy.yaml
+++ b/submariner/templates/engine-deploy.yaml
@@ -130,5 +130,5 @@ spec:
       restartPolicy: Always
       schedulerName: default-scheduler
       securityContext: {}
-      terminationGracePeriodSeconds: 0
+      terminationGracePeriodSeconds: 10
       serviceAccountName: {{ template "submariner.engineServiceAccountName" . }}
diff --git a/submariner/templates/globalnet.yaml b/submariner/templates/globalnet.yaml
index a1d894a..5774757 100644
--- a/submariner/templates/globalnet.yaml
+++ b/submariner/templates/globalnet.yaml
@@ -21,6 +21,7 @@ spec:
       hostNetwork: true
       serviceAccountName: submariner-globalnet
       serviceAccount: submariner-globalnet
+      terminationGracePeriodSeconds: 10
       nodeSelector:
         submariner.io/gateway: 'true'
       containers:
@@ -31,7 +32,7 @@ spec:
             - name: SUBMARINER_CLUSTERID
               value: '{{ .Values.submariner.clusterId }}'
             - name: SUBMARINER_EXCLUDENS
-              value: 'submariner,kube-system,operators'
+              value: 'submariner-operator,kube-system,operators'
             - name: SUBMARINER_NAMESPACE
               value: '{{ .Release.Namespace }}'
           securityContext:
diff --git a/submariner/templates/route-agent-ds.yaml b/submariner/templates/route-agent-ds.yaml
index 1473300..860ad93 100644
--- a/submariner/templates/route-agent-ds.yaml
+++ b/submariner/templates/route-agent-ds.yaml
@@ -22,7 +22,7 @@ spec:
         component: routeagent
     spec:
       serviceAccountName: {{ template "submariner.routeAgentServiceAccountName" . }}
-      terminationGracePeriodSeconds: 0
+      terminationGracePeriodSeconds: 10
       hostNetwork: true
       containers:
       - name: routeagent