diff --git a/containers/Makefile b/containers/Makefile
index e8e9ae69b..389726595 100644
--- a/containers/Makefile
+++ b/containers/Makefile
@@ -11,8 +11,7 @@ MAKEFLAGS += --silent
 endif
 
 PODMAN := $(shell command -v podman)
-
-CONTAINER_TAG := latest
+CONTAINER_TAG := $(shell git describe --always --abbrev=12)
 
 .PHONY: ec
 ec:
diff --git a/containers/ec/Containerfile b/containers/ec/Containerfile
index c78a91940..6e1c3f975 100644
--- a/containers/ec/Containerfile
+++ b/containers/ec/Containerfile
@@ -6,13 +6,13 @@
 
 # NOTE: The repository is specified in the image name to make it explicit
 # which source is being trusted to provide the image.
-ARG CONTAINER_IMAGE="docker.io/library/debian:trixie-20241202-slim"
+ARG CONTAINER_IMAGE="docker.io/library/debian:trixie-20250520-slim"
 
 ARG SDCC_REPO="https://svn.code.sf.net/p/sdcc/code"
 ARG SDCC_REV="14648"
 ARG SDCC_VERSION="4.4.0"
 
-ARG RUST_TOOLCHAIN="nightly-2024-05-11"
+ARG RUST_TOOLCHAIN="1.85.0"
 
 # Build SDCC toolchain
 FROM ${CONTAINER_IMAGE} as sdcc-build
@@ -101,7 +101,7 @@ RUN apt-get --quiet update \
     && apt-get clean
 
 # XXX: rustup 1.27 does not recognize toolchain if preceding option specifies
-# a comma seprates list as an argument with a space.
+# a comma separated list as an argument with a space.
 # Ref: https://github.com/rust-lang/rustup/issues/4073
 RUN rustup toolchain install \
         --no-self-update \