diff --git a/Dockerfile b/Dockerfile
index c9e2940..829b582 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,19 @@
-FROM jlesage/baseimage-gui:ubuntu-16.04
+FROM jlesage/baseimage-gui:debian-11
 
-ENV APP_NAME="iDRAC 6" \
-    IDRAC_PORT=443
+ENV APP_NAME="iDRAC 6"  \
+    IDRAC_PORT=443      \
+    DISPLAY_WIDTH=801   \
+    DISPLAY_HEIGHT=621
 
 COPY keycode-hack.c /keycode-hack.c
 
+RUN APP_ICON_URL=https://raw.githubusercontent.com/DomiStyle/docker-idrac6/master/icon.png && \
+    install_app_icon.sh "$APP_ICON_URL"
+
 RUN apt-get update && \
-    apt-get install -y wget software-properties-common && \
-    add-apt-repository ppa:openjdk-r/ppa && \
-    apt-get update && \
-    apt-get install -y openjdk-7-jdk gcc && \
+    apt-get install -y wget software-properties-common libx11-dev gcc && \
+    wget -nc https://cdn.azul.com/zulu/bin/zulu7.52.0.11-ca-jdk7.0.332-linux_amd64.deb && \
+    apt-get install -y ./zulu7.52.0.11-ca-jdk7.0.332-linux_amd64.deb && \
     gcc -o /keycode-hack.so /keycode-hack.c -shared -s -ldl -fPIC && \
     apt-get remove -y gcc software-properties-common && \
     apt-get autoremove -y && \
diff --git a/icon.png b/icon.png
new file mode 100644
index 0000000..e8770ad
Binary files /dev/null and b/icon.png differ