diff --git a/.ci/tests/integration-oauth2/e2e.yaml b/.ci/tests/integration-oauth2/e2e.yaml
index dc13fcb3..885352fb 100644
--- a/.ci/tests/integration-oauth2/e2e.yaml
+++ b/.ci/tests/integration-oauth2/e2e.yaml
@@ -92,8 +92,8 @@ setup:
       command: |
         make generate
         make helm-crds
-        image="function-mesh-operator:latest"
-        IMG=${image} make docker-build-skip-test
+        image="function-mesh:latest"
+        docker build --platform linux/amd64 -f operator.Dockerfile -t $image .
         kind load docker-image ${image}
         helm install ${FUNCTION_MESH_RELEASE_NAME} -n ${FUNCTION_MESH_NAMESPACE} --set operatorImage=${image} --create-namespace charts/function-mesh-operator
       wait:
diff --git a/.ci/tests/integration-oauth2/e2e_with_downloader.yaml b/.ci/tests/integration-oauth2/e2e_with_downloader.yaml
index 14445cfc..461a8025 100644
--- a/.ci/tests/integration-oauth2/e2e_with_downloader.yaml
+++ b/.ci/tests/integration-oauth2/e2e_with_downloader.yaml
@@ -92,8 +92,8 @@ setup:
       command: |
         make generate
         make helm-crds
-        image="function-mesh-operator:latest"
-        IMG=${image} make docker-build-skip-test
+        image="function-mesh:latest"
+        docker build --platform linux/amd64 -f operator.Dockerfile -t $image .
         kind load docker-image ${image}
         helm install ${FUNCTION_MESH_RELEASE_NAME} -n ${FUNCTION_MESH_NAMESPACE} --set operatorImage=${image} --set controllerManager.enableInitContainers=true --create-namespace charts/function-mesh-operator
       wait:
diff --git a/operator.Dockerfile b/operator.Dockerfile
index 60e502cf..7624968d 100644
--- a/operator.Dockerfile
+++ b/operator.Dockerfile
@@ -1,5 +1,14 @@
 FROM alpine:3.20
 
-RUN apk add tzdata --no-cache
-RUN apk upgrade --no-cache
+ENV GID=10001
+ENV UID=10000
+ENV USER=pulsar
+
+RUN apk upgrade --no-cache \
+    && apk add tzdata --no-cache \
+    && addgroup -g $GID pulsar \
+    && adduser -u $UID -G pulsar -D -g '' $USER
+
 ADD bin/function-mesh-controller-manager /manager
+
+USER $USER