diff --git a/Dockerfile b/Dockerfile
index 6cce705..2416c70 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:25.04 AS BlenderDocker
+FROM ubuntu:25.04 AS b3dock
 
 # Setup all software version request
 ARG b3d_vs_major=5.1
@@ -40,15 +40,17 @@ RUN cd /opt/blender && make
 
 ## Setup a Multistage optimisation
 FROM ubuntu:25.04
-COPY --from=BlenderDocker /opt/blender/build_linux/bin /opt/blender
-ARG b3d_vs_major
-#ENV B3D_ADDON_PATH "$HOME/.config/blender/${b3d_vs_major}/scripts/addons"
 
 RUN apt-get update && apt-get install -y \
     libxi6 \
     libxxf86vm1 \
-    libxrender1 \
-    libgl1-mesa-glx
+    libxrender1
+
+USER bld
+COPY --from=b3dock /opt/build_linux/bin/blender /opt/blender
+ARG b3d_vs_major
+ENV B3D_ADDON_PATH="/home/bld/.config/blender/${b3d_vs_major}/scripts/addons"
+
 
 # Working Directory setup
 WORKDIR /
\ No newline at end of file