diff --git a/Dockerfile b/Dockerfile
index eaec842..cb93ae0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,8 @@ FROM opennms/openjdk:latest
 
 LABEL maintainer "Ronny Trommer <ronny@opennms.org>"
 
-ARG MINION_VERSION=develop
+ARG MINION_VERSION=branches/release-24.0.0
+ARG MIRROR_HOST=yum.opennms.org
 
 ENV MINION_HOME /opt/minion
 ENV MINION_CONFIG /opt/minion/etc/org.opennms.minion.controller.cfg
@@ -19,8 +20,12 @@ ENV OPENNMS_BROKER_USER minion
 ENV OPENNMS_BROKER_PASS minion
 
 RUN yum -y --setopt=tsflags=nodocs update && \
-    rpm -Uvh http://yum.opennms.org/repofiles/opennms-repo-${MINION_VERSION}-rhel7.noarch.rpm && \
-    rpm --import http://yum.opennms.org/OPENNMS-GPG-KEY && \
+    rpm -Uvh https://${MIRROR_HOST}/repofiles/opennms-repo-${MINION_VERSION/\//-}-rhel7.noarch.rpm && \
+    rpm --import https://${MIRROR_HOST}/OPENNMS-GPG-KEY && \
+    curl https://yum.opennms.org/stable/rhel7/jicmp/jicmp-2.0.3-1.el7.centos.x86_64.rpm -o /tmp/jicmp.rpm && \
+    curl https://yum.opennms.org/stable/rhel7/jicmp6/jicmp6-2.0.2-1.el7.centos.x86_64.rpm -o /tmp/jicmp6.rpm && \
+    yum -y install /tmp/jicmp.rpm && \
+    yum -y install /tmp/jicmp6.rpm && \
     yum -y install opennms-minion && \
     yum clean all && \
     rm -rf /var/cache/yum && \
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index b5b1406..ff8bd2e 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -10,6 +10,9 @@
 # Cause false/positives
 # shellcheck disable=SC2086
 
+# To avoid issues with OpenShift
+umask 002
+
 MINION_HOME="/opt/minion"
 MINION_CONFIG="/opt/minion/etc/org.opennms.minion.controller.cfg"
 MINION_OVERLAY_ETC="/opt/minion-etc-overlay"
@@ -154,6 +157,7 @@ applyOverlayConfig() {
 }
 
 start() {
+    export KARAF_EXEC="exec"
     cd ${MINION_HOME}/bin
     exec ./karaf server
 }