diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 000000000..1ae16b787
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,15 @@
+{
+  "name": "System76 EC",
+  "build": {
+    "dockerfile": "../tools/containers/ec/Containerfile"
+  },
+  "customizations": {
+    "vscode": {
+      "settings": {},
+      "extensions": [
+        "EditorConfig.EditorConfig",
+        "rust-lang.rust-analyzer"
+      ]
+    }
+  }
+}
diff --git a/.editorconfig b/.editorconfig
index b5215f545..be8e99d11 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -19,5 +19,5 @@ trim_trailing_whitespace = false
 [{Makefile,*.mk}]
 indent_style = tab
 
-[*.yml]
+[*.{json,yaml,yml}]
 indent_size = 2
diff --git a/REUSE.toml b/REUSE.toml
index 6ad3d7a88..b5c3c05ce 100644
--- a/REUSE.toml
+++ b/REUSE.toml
@@ -14,6 +14,7 @@ SPDX-FileCopyrightText = "NONE"
 
 [[annotations]]
 path = [
+    ".devcontainer/**",
     "Makefile",
     "README.md",
     "docs/**",
diff --git a/tools/containers/ec/Containerfile b/tools/containers/ec/Containerfile
index c1e0b9459..cad433eeb 100644
--- a/tools/containers/ec/Containerfile
+++ b/tools/containers/ec/Containerfile
@@ -1,87 +1,14 @@
 # SPDX-License-Identifier: CC0-1.0
 # SPDX-FileCopyrightText: NONE
 
-# A container for 8051 development using Small Device C Compiler.
-# SDCC: https://sdcc.sourceforge.net/
+# A container for System76 EC development.
 
-# 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-20250520-slim"
-
-ARG SDCC_REPO="https://svn.code.sf.net/p/sdcc/code"
-ARG SDCC_REV="14648"
-ARG SDCC_VERSION="4.4.0"
+ARG CONTAINER_IMAGE="docker.io/library/debian:trixie-20260713-slim@sha256:53dfdbcd6fbc78c5052f35d2a5c798259f4c615cd93582b4ff5ad4f04249c7e3"
 
 ARG RUST_TOOLCHAIN="1.85.0"
 
-# Build SDCC toolchain
-FROM ${CONTAINER_IMAGE} as sdcc-build
-ARG SDCC_REPO
-ARG SDCC_REV
-ARG SDCC_VERSION
-WORKDIR /tmp
-
-RUN apt-get --quiet update \
-    && apt-get --quiet install --no-install-recommends --assume-yes \
-        autoconf \
-        automake \
-        bison \
-        ca-certificates \
-        flex \
-        g++ \
-        gcc \
-        libboost-dev \
-        make \
-        subversion \
-        zlib1g-dev \
-    && apt-get clean
-
-RUN svn checkout \
-    --depth infinity \
-    --revision ${SDCC_REV} \
-    ${SDCC_REPO}/tags/sdcc-${SDCC_VERSION}/sdcc \
-    sdcc
-
-# Only the MCS-51 port is needed.
-RUN cd sdcc \
-    && sh ./configure \
-        --disable-z80-port \
-        --disable-z180-port \
-        --disable-r2k-port \
-        --disable-r2ka-port \
-        --disable-r3ka-port \
-        --disable-sm83-port \
-        --disable-tlcs90-port \
-        --disable-ez80_z80-port \
-        --disable-z80n-port \
-        --disable-ds390-port \
-        --disable-ds400-port \
-        --disable-pic14-port \
-        --disable-pic16-port \
-        --disable-hc08-port \
-        --disable-s08-port \
-        --disable-stm8-port \
-        --disable-pdk13-port \
-        --disable-pdk14-port \
-        --disable-pdk15-port \
-        --disable-mos6502-port \
-        --disable-ucsim \
-        --disable-sdcdb \
-        --disable-non-free \
-        --prefix= \
-    && make -j $(nproc) \
-    && make install DESTDIR=/opt/sdcc
-
-# EC development environment
 FROM ${CONTAINER_IMAGE}
-ARG SDCC_REV
-ARG SDCC_VERSION
 ARG RUST_TOOLCHAIN
-COPY --from=sdcc-build /opt/sdcc /opt/sdcc
-ENV SDCC_REV "${SDCC_REV}"
-ENV SDCC_VERSION "${SDCC_VERSION}"
-ENV SDCC_PATH "/opt/sdcc"
-ENV PATH "${SDCC_PATH}/bin:$PATH"
 
 RUN apt-get --quiet update \
     && apt-get --quiet install --no-install-recommends --assume-yes \
@@ -92,10 +19,12 @@ RUN apt-get --quiet update \
         git \
         libc6-dev \
         libhidapi-dev \
+        libstdc++6 \
         make \
         pkgconf \
         reuse \
         rustup \
+        sdcc \
         shellcheck \
         uncrustify \
         xxd \
@@ -105,7 +34,6 @@ RUN apt-get --quiet update \
 # 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 \
         --target x86_64-unknown-linux-gnu,x86_64-unknown-uefi \
         --profile minimal \
         --component=clippy,rustfmt \