diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
index ffbe980..01e51c0 100644
--- a/.github/workflows/build-images.yml
+++ b/.github/workflows/build-images.yml
@@ -109,12 +109,12 @@ jobs:
             ruby_version: "3.3"
             platforms: "linux/amd64,linux/arm64"
             languages: "ruby"
-          # Web (browsers - amd64 only, Chrome/Firefox packages are x86_64)
+          # Web (browsers)
           - repo: dev-web
             key: web
             tag: "latest"
             browsers: "true"
-            platforms: "linux/amd64"
+            platforms: "linux/amd64,linux/arm64"
             languages: "html,css,javascript"
           # Full image with all languages
           - repo: dev-full
diff --git a/Dockerfile b/Dockerfile
index 79d9a19..5ed3f14 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:latest
+FROM debian:trixie-slim
 
 # =============================================================================
 # VERSION CONFIGURATION
@@ -131,22 +131,24 @@ RUN if [ "$INSTALL_RUBY" = "true" ]; then \
       bundler --version ; \
     fi
 
-# Browsers (Google Chrome + Firefox)
+# Browsers (Chromium + Firefox)
 RUN if [ "$INSTALL_BROWSERS" = "true" ]; then \
       apt-get update && apt-get install -y \
         wget \
-        libdbus-glib-1-2 && \
-      # Install Google Chrome from upstream
-      wget -q https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb && \
-      apt-get install -y ./google-chrome-stable_current_amd64.deb && \
-      rm google-chrome-stable_current_amd64.deb && \
-      # Install Firefox from Mozilla
-      wget -q -O firefox.tar.xz "https://download.mozilla.org/?product=firefox-latest&os=linux64&lang=en-US" && \
+        libdbus-glib-1-2 \
+        --no-install-recommends chromium && \
+      ln -sf /usr/bin/chromium /usr/local/bin/google-chrome && \
+      dpkgArch="$(dpkg --print-architecture)"; \
+      case "$dpkgArch" in \
+        amd64) FF_OS='linux64';; \
+        arm64) FF_OS='linux64-aarch64';; \
+      esac && \
+      wget -q -O firefox.tar.xz "https://download.mozilla.org/?product=firefox-latest&os=$FF_OS&lang=en-US" && \
       tar -xf firefox.tar.xz -C /opt && \
       ln -s /opt/firefox/firefox /usr/local/bin/firefox && \
       rm firefox.tar.xz && \
       rm -rf /var/lib/apt/lists/* && \
-      echo "Chrome version:" && google-chrome --version && \
+      echo "Chromium version:" && chromium --version && \
       echo "Firefox version:" && firefox --version ; \
     fi
 
diff --git a/README.md b/README.md
index 03f68e4..bf9662b 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ oz agent run-cloud \
 
 ## Available images
 
-All images are based on Ubuntu. Language-specific images extend the base image with additional
+All images are based on Debian. Language-specific images extend the base image with additional
 runtimes. Each image is published in two variants:
 
 - **Base** (e.g. `warpdotdev/dev-rust:1.85`) — language runtimes and core tools only