diff --git a/deploy/longhorn.yaml b/deploy/longhorn.yaml
index ad61766..bc49737 100644
--- a/deploy/longhorn.yaml
+++ b/deploy/longhorn.yaml
@@ -1291,7 +1291,10 @@ spec:
             description: EngineImageSpec defines the desired state of the Longhorn engine image
             properties:
               image:
+                minLength: 1
                 type: string
+            required:
+            - image
             type: object
           status:
             description: EngineImageStatus defines the observed state of the Longhorn engine image
@@ -3466,6 +3469,8 @@ spec:
       - name: longhorn-conversion-webhook
         image: longhornio/longhorn-manager:master-head
         imagePullPolicy: IfNotPresent
+        securityContext:
+          runAsUser: 2000
         command:
         - longhorn-manager
         - conversion-webhook
@@ -3524,10 +3529,15 @@ spec:
       - name: wait-longhorn-conversion-webhook
         image: longhornio/longhorn-manager:master-head
         command: ['sh', '-c', 'while [ $(curl -m 1 -s -o /dev/null -w "%{http_code}" -k https://longhorn-conversion-webhook:9443/v1/healthz) != "200" ]; do echo waiting; sleep 2; done']
+        imagePullPolicy: IfNotPresent
+        securityContext:
+          runAsUser: 2000
       containers:
       - name: longhorn-admission-webhook
         image: longhornio/longhorn-manager:master-head
         imagePullPolicy: IfNotPresent
+        securityContext:
+          runAsUser: 2000
         command:
         - longhorn-manager
         - admission-webhook
@@ -3544,4 +3554,8 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
+        - name: NODE_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: spec.nodeName
       serviceAccountName: longhorn-service-account