diff --git a/.github/workflows/Dockerfile.dev b/.github/workflows/Dockerfile.dev
index 1c529fc..2e969d2 100644
--- a/.github/workflows/Dockerfile.dev
+++ b/.github/workflows/Dockerfile.dev
@@ -1,5 +1,5 @@
 # Keep tracking base image
-FROM rust:1.81-slim-bookworm
+FROM rust:1.85-slim-bookworm
 
 # Set needed env path
 ENV PATH="/opt/armv7l-linux-musleabihf-cross/:/opt/armv7l-linux-musleabihf-cross/bin/:/opt/aarch64-linux-musl-cross/:/opt/aarch64-linux-musl-cross/bin/:/opt/x86_64-linux-musl-cross/:/opt/x86_64-linux-musl-cross/bin/:$PATH"
diff --git a/.github/workflows/docker-build-static.yml b/.github/workflows/docker-build-static.yml
index cefab74..0d0266f 100644
--- a/.github/workflows/docker-build-static.yml
+++ b/.github/workflows/docker-build-static.yml
@@ -84,7 +84,7 @@ jobs:
     needs: pre_job
     if: ${{ needs.pre_job.outputs.should_skip != 'true' || github.event_name == 'release' }}
     container:
-      image: lldap/rust-dev:v81
+      image: lldap/rust-dev:latest
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4.2.2
@@ -125,7 +125,7 @@ jobs:
       matrix:
         target: [armv7-unknown-linux-musleabihf, aarch64-unknown-linux-musl, x86_64-unknown-linux-musl]
     container:
-      image: lldap/rust-dev:v81
+      image: lldap/rust-dev:latest
       env:
         CARGO_TERM_COLOR: always
         RUSTFLAGS: -Ctarget-feature=+crt-static
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..ce06dae
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,2 @@
+build-dev-container:
+	docker buildx build --tag lldap/rust-dev --file .github/workflows/Dockerfile.dev --push .github/workflows