diff --git a/.run/Dockerfile.run.xml b/.run/Build BlenderDocker.run.xml
similarity index 69%
rename from .run/Dockerfile.run.xml
rename to .run/Build BlenderDocker.run.xml
index a98f925..bf35d50 100644
--- a/.run/Dockerfile.run.xml
+++ b/.run/Build BlenderDocker.run.xml	
@@ -1,20 +1,21 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Dockerfile" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
+  <configuration default="false" name="Build BlenderDocker" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="stilobique/blender:3.4.0" />
+        <option name="imageTag" value="stilobique/blender:5.1.2" />
         <option name="buildArgs">
           <list>
             <DockerEnvVarImpl>
               <option name="name" value="b3d_vs_major" />
-              <option name="value" value="3.4" />
+              <option name="value" value="5.1" />
             </DockerEnvVarImpl>
             <DockerEnvVarImpl>
               <option name="name" value="b3d_vs_minor" />
-              <option name="value" value="0" />
+              <option name="value" value="2" />
             </DockerEnvVarImpl>
           </list>
         </option>
+        <option name="buildCliOptions" value="--debug" />
         <option name="buildOnly" value="true" />
         <option name="containerName" value="blender-latest" />
         <option name="sourceFilePath" value="Dockerfile" />
@@ -28,6 +29,7 @@
         </option>
       </settings>
     </deployment>
+    <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="false" />
     <method v="2" />
   </configuration>
 </component>
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index c58c1ea..6cce705 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,8 @@
-FROM ubuntu:22.04 AS blender
+FROM ubuntu:25.04 AS BlenderDocker
 
 # Setup all software version request
-ARG b3d_vs_major=2.90
+ARG b3d_vs_major=5.1
 ARG b3d_vs_minor=0
-ARG subversion=63014
 
 LABEL Author="stilobique"
 LABEL Title="Blender Docker for Unit Test"
@@ -13,41 +12,37 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 # Install dependencies
 RUN apt-get update && apt-get install -y \
-    build-essential \
-    gcc \
     git \
-    cmake \
-    libc6-dev \
-    libx11-dev \
+    git-lfs \
+    python3 \
+    build-essential \
     subversion \
-    libxrandr-dev \
-    libxcursor-dev \
+    cmake \
+    libx11-dev \
     libxxf86vm-dev \
-    libxinerama-dev \
-    libglew-dev \
+    libxcursor-dev \
     libxi-dev \
-    python3
-
-# Debug
-RUN echo Build Blender v${b3d_vs_major}.${b3d_vs_minor}
-
-ADD . /opt/blender-git
+    libxrandr-dev \
+    libxinerama-dev \
+    libegl-dev \
+    libwayland-dev \
+    wayland-protocols \
+    libxkbcommon-dev \
+    libdbus-1-dev \
+    linux-libc-dev
 
 # Compile Blender
-RUN cd /opt/blender-git/ \
-    && git checkout v${b3d_vs_major}.${b3d_vs_minor} \
-    && git config --global user.email "contact@aurelien-vaillant.net" \
-    && git config --global user.name "Aurelien Vaillant" \
-    && mkdir /opt/blender-git/lib \
-    && cd /opt/blender-git/lib \
-    && svn checkout -r${subversion} \
-    && make
+RUN git clone --depth 1 --branch v${b3d_vs_major}.${b3d_vs_minor} \
+    https://projects.blender.org/blender/blender.git /opt/blender
 
-# Setup a Multistage optimisation
-FROM ubuntu:22.04
-COPY --from=blender /opt/blender-git/build_linux/bin /opt/blender
+RUN cd /opt/blender && make update
+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"
+#ENV B3D_ADDON_PATH "$HOME/.config/blender/${b3d_vs_major}/scripts/addons"
 
 RUN apt-get update && apt-get install -y \
     libxi6 \
diff --git a/README.md b/README.md
index a913d12..35cd3bf 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Blender](https://img.shields.io/badge/blender-3.0.0-%23F5792A.svg?style=flat&logo=blender&logoColor=white)](https://www.blender.org/download/)
+[![Blender](https://img.shields.io/badge/blender-5.1.2-%23F5792A.svg?style=flat&logo=blender&logoColor=white)](https://www.blender.org/download/)
 [![pipeline status](https://gitlab.com/stilobique/blender-docker/badges/main/pipeline.svg)](https://gitlab.com/stilobique/blender-docker/-/commits/main)