diff --git a/Dockerfile b/Dockerfile
index e4f4552..f916571 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM webcenter/openjdk-jre:8
+FROM openjdk:11.0.11-jre
 MAINTAINER Sebastien LANGOUREAUX <linuxworkgroup@hotmail.com>
 
 ENV ACTIVEMQ_CONFIG_DIR /opt/activemq/conf.tmp
@@ -10,15 +10,18 @@ RUN apt-get update && \
     update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX && \
     locale-gen en_US.UTF-8 && \
     dpkg-reconfigure locales && \
-    rm -rf /var/lib/apt/lists/*
+    rm -rf /var/lib/apt/lists/* && \
+    apt-get clean && apt-get autoremove --yes
 
+# Install wheel
+RUN pip install wheel
 # Install stompy
 RUN pip install stomp.py
 
 # Lauch app install
 COPY assets/setup/ /app/setup/
-RUN chmod +x /app/setup/install
-RUN /app/setup/install
+RUN chmod +x /app/setup/install && \
+     /app/setup/install
 
 
 # Copy the app setting
diff --git a/README.md b/README.md
index 550d17e..6b7c2fb 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,12 @@
 # Table of Contents
+- [Table of Contents](#table-of-contents)
+- [Credits](#credits)
 - [Introduction](#introduction)
-    - [Version](#version)
-    - [Changelog](Changelog.md)
+  - [Version](#version)
 - [Hardware Requirements](#hardware-requirements)
-    - [CPU](#cpu)
-    - [Memory](#memory)
-    - [Storage](#storage)
+  - [CPU](#cpu)
+  - [Memory](#memory)
+  - [Storage](#storage)
 - [Contributing](#contributing)
 - [Issues](#issues)
 - [Installation](#installation)
@@ -17,10 +18,14 @@
   - [Data Store](#data-store)
   - [BROKER](#broker)
   - [Disk usage](#disk-usage)
-  - [JMX](#JMX)
+  - [JMX](#jmx)
   - [Avaible Configuration Parameters](#avaible-configuration-parameters)
   - [Advance configuration](#advance-configuration)
-- [References](#references)
+
+# Credits 
+
+This project has been forked from https://github.com/disaster37/activemq.git , the associated docker hub is  webcenter/activemq
+The goal of the fork is to have the same image but updated to 5.16.3
 
 # Introduction
 
@@ -28,7 +33,7 @@ Dockerfile to build a ActiveMQ container image.
 
 ## Version
 
-Current Version: **5.14.3**
+Current Version: **5.16.3**
 
 # Hardware Requirements
 
@@ -98,19 +103,19 @@ In your issue report please make sure you provide the following information:
 Pull the image from the docker index. This is the recommended method of installation as it is easier to update image. These builds are performed by the **Docker Trusted Build** service.
 
 ```bash
-docker pull webcenter/activemq:5.14.3
+docker pull ilyesaj/activemq:5.16.3
 ```
 
 You can also pull the `latest` tag which is built from the repository *HEAD*
 
 ```bash
-docker pull webcenter/activemq:latest
+docker pull ilyesaj/activemq:latest
 ```
 
 Alternately you can build the image locally.
 
 ```bash
-git clone https://github.com/disaster37/activemq.git
+git clone https://github.com/ilyesAj/activemq.git
 cd activemq
 docker build --tag="$USER/activemq" .
 ```
@@ -146,7 +151,7 @@ docker run --name='activemq' -d \
 -p 8161:8161 \
 -p 61616:61616 \
 -p 61613:61613 \
-webcenter/activemq:5.14.3
+ilyesaj/activemq:5.16.3
 ```
 
 
diff --git a/assets/setup/install b/assets/setup/install
index b1b9ad3..6b4d7c7 100644
--- a/assets/setup/install
+++ b/assets/setup/install
@@ -2,7 +2,7 @@
 set -e
 
 
-ACTIVEMQ_VERSION="5.14.3"
+ACTIVEMQ_VERSION="5.16.3"
 ACTIVEMQ_HOME="/opt/activemq"
 SETUP_DIR="/app/setup"
 LOG_DIR="/var/log"
@@ -27,7 +27,8 @@ chown -R activemq:activemq ${ACTIVEMQ_HOME}
 chown -R activemq:activemq ${DATA_DIR}/activemq
 chown -R activemq:activemq ${LOG_DIR}/activemq
 
-
+# activate access to console https://issues.apache.org/jira/browse/AMQ-8018
+sed -i "s|127.0.0.1|0.0.0.0|g" ${ACTIVEMQ_HOME}/conf/jetty.xml
 
 # We setup logrotate for activemq
 cat > /etc/logrotate.d/activemq <<EOF
diff --git a/fig.yml b/fig.yml
index ef18e4d..fae4aac 100644
--- a/fig.yml
+++ b/fig.yml
@@ -1,2 +1,2 @@
 activemq:
-  image: webcenter/activemq:5.14.3
+  image: webcenter/activemq:5.16.3
diff --git a/test/test_functionnal.sh b/test/test_functionnal.sh
old mode 100644
new mode 100755