diff --git a/Dockerfile b/Dockerfile
index 22ca872..2f99dc8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,14 @@
-FROM eclipse-temurin:17
+FROM eclipse-temurin:21-jre
 
-ENV ACTIVEMQ_VERSION 5.17.2
+ENV ACTIVEMQ_VERSION 5.18.3
 ENV ACTIVEMQ apache-activemq-$ACTIVEMQ_VERSION
 ENV ACTIVEMQ_TCP=61616 ACTIVEMQ_AMQP=5672 ACTIVEMQ_STOMP=61613 ACTIVEMQ_MQTT=1883 ACTIVEMQ_WS=61614 ACTIVEMQ_UI=8161
-ENV SHA512_VAL=7c6ee4c1a9f58ccaa374d8528255d55c181c3402855fe06202bb30f722bdbd69a2cebaf0eded67324f94b4158b6d8d97b621d8730d92676e51b982ed4fc8a7b0
+ENV SHA512_VAL=61abc4a08b9e1db6a5b1062bb1c839171e93bcb571817fd81744dd19874d713840bba99c7979d45bcb832d13ea01986b76fb11720f5ec63a0283e7d1934a33cc
 
 
 ENV ACTIVEMQ_HOME /opt/activemq
 
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 RUN mkdir -p /opt && \
     wget --no-verbose https://archive.apache.org/dist/activemq/$ACTIVEMQ_VERSION/$ACTIVEMQ-bin.tar.gz  -O $ACTIVEMQ-bin.tar.gz &&\
     # Validate checksum