diff --git a/Dockerfile b/Dockerfile
index 53e4a23..ec6cac4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,34 @@
-FROM "ubuntu:20.10"
-LABEL maintainer="Cabillot Julien <dockerimages@cabillot.eu>"
+ARG  UBUNTU_VERSION="20.10"
+FROM "ubuntu:${UBUNTU_VERSION}"
+ARG  UBUNTU_VERSION
+
+#ARG OCTANT_VERSION="0.16.1"
 
 USER "root"
 
-RUN curl -o /octant.deb -kL https://github.com/vmware-tanzu/octant/releases/download/$(curl -s https://github.com/vmware-tanzu/octant/releases/latest | sed 's/^.*tag\///' | sed 's/\".*$//')/octant_$(curl -s https://github.com/vmware-tanzu/octant/releases/latest | sed 's/^.*tag\///' | sed 's/\".*$//' | sed 's/v//' )_Linux-64bit.deb && \
-    dpkg -i /octant.deb && \
-    rm -f /octant.deb
+COPY "entrypoint.sh" "/entrypoint.sh"
 
-COPY octant/entrypoint.sh /root/entrypoint.sh
-RUN chmod +x /root/entrypoint.sh
+RUN export DEBIAN_FRONTEND="noninteractive" && \
+    export BUILD_PACKAGES="wget curl" && \
+    apt update -qq && \
+    apt install -qq --yes ${BUILD_PACKAGES} && \
+    #wget --quiet "https://github.com/vmware-tanzu/octant/releases/download/v${OCTANT_VERSION}/octant_${OCTANT_VERSION}_Linux-64bit.deb" -O octant.deb && \
+    curl -o /octant.deb -kL https://github.com/vmware-tanzu/octant/releases/download/$(curl -s https://github.com/vmware-tanzu/octant/releases/latest | sed 's/^.*tag\///' | sed 's/\".*$//')/octant_$(curl -s https://github.com/vmware-tanzu/octant/releases/latest | sed 's/^.*tag\///' | sed 's/\".*$//' | sed 's/v//' )_Linux-64bit.deb && \
+    dpkg -i "octant.deb" && \
+    rm -f "octant.deb" && \
+    apt-get -qq --yes remove --purge ${BUILD_PACKAGES} && \
+    apt-get -qq --yes autoremove --purge && \
+    apt-get -qq --yes clean all && \
+    rm -rf "/usr/share/doc/"* \
+           "/var/cache/"* \
+           "/var/lib/apt/lists/"* \
+           "/usr/src/"* \
+           "/var/cache/"* \
+           "/var/log/"{apt/*,dpkg.log} \
+           "/tmp/"*
 
 #USER "iperf"
 
-CMD ["/bin/octant"]
+LABEL maintainer="Cabillot Julien <dockerimages@cabillot.eu>"
+
+CMD [ "/bin/bash", "-c", "/entrypoint.sh" ]
diff --git a/entrypoint.sh b/entrypoint.sh
new file mode 100755
index 0000000..867a594
--- /dev/null
+++ b/entrypoint.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+export OCTANT_LISTENER_ADDR="0.0.0.0:7777"
+octant -vvv --disable-open-browser