diff --git a/build-tools/Dockerfile b/build-tools/Dockerfile
index 177dd22..dadbdc0 100644
--- a/build-tools/Dockerfile
+++ b/build-tools/Dockerfile
@@ -4,23 +4,20 @@ FROM ubuntu:22.04
 ENV TZ=Europe/Berlin
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-RUN apt-get -y update && apt -y upgrade
+RUN --mount=type=cache,target=/var/lib/apt \
+    apt-get -y update && \
+    apt-get upgrade -y && \
+    apt-get install -y --no-install-recommends \
+        python3 python3-pip lsb-release software-properties-common rename wget git \
+        ninja-build make gdb gdbserver pkg-config \
+        gperf linux-tools-generic linux-tools-common valgrind \
+        clang \
+        gcc-arm-none-eabi libnewlib-arm-none-eabi libstdc++-arm-none-eabi-newlib\
+        cmake \
+        catch2 \
+        zsh
 
-# Build Env
-RUN apt-get -y install python3 python3-pip lsb-release software-properties-common rename wget git
-RUN apt-get -y install ninja-build make gdb gdbserver pkg-config
+RUN useradd -U \
+    developer
 
-# Profiling
-RUN apt-get -y install gperf linux-tools-generic linux-tools-common valgrind
-
-# Clang
-RUN apt-get -y install clang
- 
-# ARM Gcc
-RUN apt-get -y install gcc-arm-none-eabi 
-
-# CMake
-RUN apt-get -y install cmake
-
-
-RUN apt-get clean
+USER developer:developer
\ No newline at end of file
diff --git a/build-tools/docker-compose.yml b/build-tools/docker-compose.yml
new file mode 100644
index 0000000..9eb2c6c
--- /dev/null
+++ b/build-tools/docker-compose.yml
@@ -0,0 +1,6 @@
+services:
+  stm32-dev:
+    build:
+      dockerfile: Dockerfile
+      tags:
+        - stm-32-dev
\ No newline at end of file