diff --git a/Dockerfile b/Dockerfile
index 540653f..6584c68 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:latest AS blender
+FROM ubuntu:22.04 AS blender
 
 # Setup all software version request
 ARG b3d_vs_major=2.90
@@ -40,7 +40,7 @@ RUN mkdir /opt/blender-git/ && cd /opt/blender-git/ \
     && make
 
 # Setup a Multistage optimisation
-FROM ubuntu:latest
+FROM ubuntu:22.04
 COPY --from=blender /opt/blender-git/build_linux/bin /opt/blender
 ARG b3d_vs_major
 ENV B3D_ADDON_PATH "$HOME/.config/blender/${b3d_vs_major}/scripts/addons"
diff --git a/main.py b/main.py
index 86dd16c..658a7e5 100644
--- a/main.py
+++ b/main.py
@@ -44,7 +44,7 @@ def build_docker(b3d_version: (str, str), latest: bool = False):
     completed_tag_name = f'{docker_repo}:{args["b3d_vs_major"]}.{args["b3d_vs_minor"]}'
 
     print('2 -> Build from image file')
-    client.images.build(path=os.getcwd(), buildargs=args, tag=completed_tag_name)
+    client.images.build(path=os.getcwd(), buildargs=args, tag=completed_tag_name, rm=True, forcerm=True)
 
     print('3 -> Push the new images')
     client.images.push(repository=docker_repo, tag=tag)