diff --git a/Dockerfile b/Dockerfile
index 67cd86dcb..4a24eb43b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,8 +8,8 @@ RUN cross_debian_arch=$(uname -m | sed -e 's/aarch64/amd64/'  -e 's/x86_64/arm64
     cross_pkg_arch=$(uname -m | sed -e 's/aarch64/x86-64/' -e 's/x86_64/aarch64/'); \
     apt-get update -y && \
     apt-get dist-upgrade -y && \
-    apt-get install -y curl wget make git clang-17 unzip libc6-dev g++ gcc pkgconf \
-        gcc-${cross_pkg_arch}-linux-gnu libc6-${cross_debian_arch}-cross && \
+    apt-get install -y curl wget make git cmake clang-17 unzip libc6-dev g++ gcc pkgconf \
+        gcc-${cross_pkg_arch}-linux-gnu libc6-${cross_debian_arch}-cross musl-dev && \
     apt-get clean autoclean && \
     apt-get autoremove --yes
 
@@ -44,8 +44,7 @@ RUN
 RUN echo 'export PATH="/usr/local/go/bin:$PATH"' >> /etc/profile
 
 # Create rust related directories in /usr/local
-RUN mkdir -p /usr/local/cargo
-RUN mkdir -p /usr/local/rustup
+RUN mkdir -p /usr/local/cargo /usr/local/rustup
 
 # Set environment variable before rustup installation
 ENV CARGO_HOME=/usr/local/cargo
@@ -55,11 +54,12 @@ ENV RUSTUP_HOME=/usr/local/rustup
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --profile minimal --default-toolchain 1.77
 
 # Add rust related environment variables
-RUN echo 'export PATH="/usr/local/cargo/bin:$PATH"' >> /etc/profile
-RUN echo 'export CARGO_HOME="/usr/local/cargo"' >> /etc/profile
-RUN echo 'export RUSTUP_HOME="/usr/local/rustup"' >> /etc/profile
+RUN echo 'export PATH="/usr/local/cargo/bin:$PATH"' >> /etc/profile     \
+    && echo 'export CARGO_HOME="/usr/local/cargo"' >> /etc/profile      \
+    && echo 'export RUSTUP_HOME="/usr/local/rustup"' >> /etc/profile
 
-# Set mode bits for rustup
-RUN chmod -R a+w /usr/local/rustup
+# Set mode bits
+RUN chmod -R a+w /usr/local/rustup      \
+    && chmod -R a+w /usr/local/cargo
 
 ENTRYPOINT ["/bin/bash", "-l", "-c"]
diff --git a/Makefile b/Makefile
index b0b6bb0b6..ac15864cc 100644
--- a/Makefile
+++ b/Makefile
@@ -137,7 +137,7 @@ integration-test-binaries: generate ebpf
 	)
 
 docker-image:
-	docker build -t profiling-agent -f Dockerfile .
+	docker build -t otel/opentelemetry-ebpf-profiler-dev -f Dockerfile .
 
 agent:
 	docker run -v "$$PWD":/agent -it --rm --user $(shell id -u):$(shell id -g) otel/opentelemetry-ebpf-profiler-dev:latest \