diff --git a/Dockerfile b/Dockerfile
index a53d6c0..8147e0d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,18 +5,16 @@ LABEL maintainer="David Lung (lungdm@gmail.com); Padraig Gleeson (p.gleeson@gmai
 ARG USR=ow
 ENV USER=$USR
 
+RUN touch /var/mail/ubuntu && chown ubuntu /var/mail/ubuntu && userdel -r ubuntu
+
 RUN apt-get update && \
   apt-get upgrade -y && \
   apt-get dist-upgrade -y
 
-RUN mkdir -p /etc/sudoers.d && \
-  export uid=1000 gid=1000 && \
-  mkdir -p /home/$USER && \
-  echo "$USER:x:${uid}:${gid}:$USER,,,:/home/$USER:/bin/bash" >> /etc/passwd && \
-  echo "$USER:x:${uid}:" >> /etc/group && \
-  echo "$USER ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/$USER && \
-  chmod 0440 /etc/sudoers.d/$USER && \
-  chown ${uid}:${gid} -R /home/$USER
+RUN apt-get update && apt-get install -y sudo && \
+    useradd -m -s /bin/bash -u 1000 $USER && \
+    echo "$USER ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/$USER && \
+    chmod 0440 /etc/sudoers.d/$USER
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -29,12 +27,11 @@ RUN apt-get install -y --no-install-recommends apt-utils \
   wget nano htop build-essential make git automake autoconf \
   g++ rpm libtool libncurses5-dev zlib1g-dev bison flex \
   sudo xorg openbox x11-xserver-utils \
-  libxext-dev libncurses-dev mercurial \
+  libxext-dev libncurses-dev \
   freeglut3-dev libglu1-mesa-dev libglew-dev python3-dev python3-pip \
   kmod dkms linux-source linux-headers-generic \
-  maven openjdk-8-jdk \
+  openjdk-21-jdk \
   libnuma1 \
-  openmpi-bin  libopenmpi-dev \
   libgl1 libglx-mesa0  libgl1-mesa-dri libfreetype6-dev \
   libxft-dev  unzip ffmpeg xvfb tmux
 
@@ -96,7 +93,8 @@ ENV NEURON_MODULE_OPTIONS=-nogui
 RUN wget https://master.dl.sourceforge.net/project/nicehashsgminerv5viptools/APP%20SDK%20A%20Complete%20Development%20Platform/AMD%20APP%20SDK%203.0%20for%2064-bit%20Linux/AMD-APP-SDKInstaller-v3.0.130.136-GA-linux64.tar.bz2 && \
     tar -xf AMD-APP-SDKInstaller-v3.0.130.136-GA-linux64.tar.bz2 && \
     printf 'Y\n\n' | sudo ./AMD-APP-SDK-v3.0.130.136-GA-linux64.sh && \
-    rm AMD-APP-SDKInstaller-v3.0.130.136-GA-linux64.tar.bz2
+    rm AMD-APP-SDKInstaller-v3.0.130.136-GA-linux64.tar.bz2 && \
+    rm AMD-APP-SDK-v3.0.130.136-GA-linux64.sh 
 
 RUN sudo ln -s /opt/AMDAPPSDK-3.0/lib/x86_64/sdk/libOpenCL.so.1 /usr/lib/libOpenCL.so.1
 RUN sudo ln -s /opt/AMDAPPSDK-3.0/lib/x86_64/sdk/libamdocl64.so /usr/lib/libamdocl64.so