diff --git a/operators/o2ims-operator/Dockerfile b/operators/o2ims-operator/Dockerfile
index 30bfc95e..b60d9c3e 100644
--- a/operators/o2ims-operator/Dockerfile
+++ b/operators/o2ims-operator/Dockerfile
@@ -14,29 +14,29 @@
 # limitations under the License.
 ##########################################################################
 
-FROM python:3.12.9-alpine3.21@sha256:28b8a72c4e0704dd2048b79830e692e94ac2d43d30c914d54def6abf74448a4e AS builder
+FROM python:3.12.10-alpine3.21@sha256:4cad1c099a56dafcfee656a1bdd88c97a1372db02e14fcffa9b1869515956deb AS builder
 
-# Create a non-root user
-RUN addgroup --gid 65535 o2ims && \
-    adduser --uid 65535 --disabled-password --home /home/o2ims -G o2ims o2ims
+# Create a non-root user and group
+RUN addgroup -g 65535 o2ims && \
+    adduser -u 65535 -G o2ims -D -h /home/o2ims o2ims
+
+# Define environment variables
+ENV VIRTUAL_ENV=/home/o2ims/venv \
+    PATH=/home/o2ims/venv/bin:$PATH
 
 # Set working directory
 WORKDIR /usr/o2ims
 
-# Copy requirements first and install dependencies
-COPY --chown=o2ims:o2ims /operators/o2ims-operator/requirements.txt requirements.txt
-RUN python -m venv /home/o2ims/venv && \
-    /home/o2ims/venv/bin/pip install --no-cache-dir -r requirements.txt
+# Copy and install dependencies
+COPY --chown=o2ims:o2ims requirements.txt .
+RUN python -m venv $VIRTUAL_ENV && \
+    pip install --no-cache-dir -r requirements.txt
 
-# Copy application files
-COPY --chown=root:root --chmod=755 /operators/o2ims-operator/controllers/ src/
+# Copy application source
+COPY --chown=o2ims:o2ims controllers/ ./src/
 
 # Switch to non-root user
 USER o2ims
 
-# Set environment variables
-ENV PATH="/home/o2ims/venv/bin:${PATH}" \
-    VIRTUAL_ENV="/home/o2ims/venv"
-
-# Run the application
+# Entrypoint
 CMD ["kopf", "run", "/usr/o2ims/src/manager.py", "--all-namespaces"]
diff --git a/operators/o2ims-operator/Makefile b/operators/o2ims-operator/Makefile
index cefa071d..2c0e687e 100644
--- a/operators/o2ims-operator/Makefile
+++ b/operators/o2ims-operator/Makefile
@@ -1,10 +1,30 @@
+#  Copyright 2025 The Nephio Authors.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+
 IMAGE_TAG ?= latest
 REGISTRY ?= docker.io/nephio
 IMAGE_NAME ?= o2ims-operator
 IMG ?= $(REGISTRY)/$(IMAGE_NAME):$(IMAGE_TAG)
 
-# This includes the following targets:
-#   docker-build, docker-push
-include ../../default-docker.mk
+include ../../detect-container-runtime.mk
+
+##@ Container images
+.PHONY: docker-build
+docker-build:  ## Build a container image from the local Dockerfile
+	$(CONTAINER_RUNTIME) buildx build --load --tag  ${IMG} -f ./Dockerfile ./
 
+.PHONY: docker-push
+docker-push: docker-build ## Build and push the container image
+	$(CONTAINER_RUNTIME) push ${IMG}