diff --git a/Dockerfile b/Dockerfile
index c32117b..a373414 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,6 @@
 # This Dockerfile is tailored for Konflux and it runs hermetically.
 
 FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.24 AS builder
-#FROM --platform=$BUILDPLATFORM quay.io/projectquay/golang:1.23 AS builder
 
 COPY snmp_notifier snmp_notifier
 
@@ -26,7 +25,7 @@ RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -mod=readonly \
     -a -tags netgo
 
 # Build stage 2
-FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi9-minimal:latest
+FROM --platform=$BUILDPLATFORM registry.redhat.io/ubi9-minimal:latest
 
 # Update the image to get the latest CVE updates
 RUN microdnf update -y && \
@@ -46,7 +45,7 @@ LABEL summary="Provides snmp_notifier container."
 LABEL io.k8s.display-name="SNMP Notifier container"
 LABEL io.k8s.description="SNMP Notifier container receives alerts from the Prometheus' Alertmanager and routes them as SNMP traps."
 LABEL io.openshift.tags="1.2.1"
-LABEL cpe=cpe:/a:redhat:ceph_storage:9::el9
+LABEL cpe=cpe:/a:redhat:ceph_storage:8::el9
 LABEL org.opencontainers.image.created="${BUILD_DATE}"
 
 
diff --git a/Dockerfile_IBM b/Dockerfile_IBM
new file mode 100644
index 0000000..a50f79f
--- /dev/null
+++ b/Dockerfile_IBM
@@ -0,0 +1,53 @@
+# Build stage 1
+ARG BASE_IMAGE=registry.redhat.io/ubi9/go-toolset:1.24.4
+
+FROM --platform=$BUILDPLATFORM ${BASE_IMAGE} AS builder
+USER root
+COPY snmp_notifier snmp_notifier
+
+WORKDIR snmp_notifier
+
+RUN dnf install -y glibc-static
+
+# Build the binary
+RUN GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -mod=readonly \
+    -o snmp_notifier \
+    -ldflags "-s \
+      -X github.com/prometheus/common/version.Version=1.2.1 \
+      -X github.com/prometheus/common/version.Revision=14ba67401c61cfc2f19ebd9ace8acdcf47b4cd49 \
+      -X github.com/prometheus/common/version.Branch=master \
+      -X github.com/prometheus/common/version.BuildUser=osbs \
+      -X github.com/prometheus/common/version.BuildDate=20211104-18:55:37 \
+      -extldflags '-static'" \
+    -a -tags netgo
+
+# Build stage 2
+FROM --platform=$BUILDPLATFORM registry.redhat.io/ubi9-minimal:latest
+
+# Update the image to get the latest CVE updates
+RUN microdnf update -y && \
+    microdnf clean all
+
+ENV OPBIN=/usr/local/bin/snmp_notifier
+
+COPY --from=builder /opt/app-root/src/snmp_notifier/snmp_notifier "$OPBIN"
+COPY --from=builder /opt/app-root/src/snmp_notifier/description-template.tpl /etc/snmp_notifier/description-template.tpl
+
+LABEL maintainer="Guillaume Abrioux <gabrioux@redhat.com>"
+LABEL com.redhat.component="snmp-notifier-container"
+LABEL name="snmp-notifier"
+LABEL version="1.2.1"
+LABEL description="SNMP Notifier container"
+LABEL summary="Provides snmp_notifier container."
+LABEL io.k8s.display-name="SNMP Notifier container"
+LABEL io.k8s.description="SNMP Notifier container receives alerts from the Prometheus' Alertmanager and routes them as SNMP traps."
+LABEL io.openshift.tags="1.2.1"
+LABEL cpe=cpe:/a:redhat:ceph_storage:8::el9
+LABEL org.opencontainers.image.created="${BUILD_DATE}"
+
+
+RUN chmod +x "$OPBIN"
+
+EXPOSE 9464
+ENTRYPOINT ["/usr/local/bin/snmp_notifier"]
+CMD ["--snmp.trap-description-template=/etc/snmp_notifier/description-template.tpl"]