diff --git a/dockerimg/Dockerfile.base b/dockerimg/Dockerfile.base
index b47b450..73fecda 100644
--- a/dockerimg/Dockerfile.base
+++ b/dockerimg/Dockerfile.base
@@ -1,3 +1,7 @@
+# Stage 1: Get Chrome/Chromium from chromedp/headless-shell
+FROM docker.io/chromedp/headless-shell:stable AS chrome
+
+# Stage 2: Main application image
 FROM ubuntu:24.04
 
 # Switch from dash to bash by default.
@@ -15,11 +19,13 @@
       'path-exclude=/usr/share/zoneinfo/*' \
     > /etc/dpkg/dpkg.cfg.d/01_nodoc
 
-# Install system packages including ca-certificates for Go downloads
+# Install system packages (removed chromium, will use headless-shell instead)
 RUN apt-get update; \
 	apt-get install -y --no-install-recommends \
 		ca-certificates wget \
-		git jq sqlite3 npm nodejs gh ripgrep fzf python3 curl vim chromium lsof iproute2 less && \
+		git jq sqlite3 npm nodejs gh ripgrep fzf python3 curl vim lsof iproute2 less \
+		libglib2.0-0 libnss3 libx11-6 libxcomposite1 libxdamage1 \
+		libxext6 libxi6 libxrandr2 libgbm1 libgtk-3-0 && \
 	apt-get clean && \
 	rm -rf /var/lib/apt/lists/* && \
 	rm -rf /usr/share/{doc,doc-base,info,lintian,man,groff,locale,zoneinfo}/*
@@ -52,6 +58,10 @@
 	go install mvdan.cc/gofumpt@latest; \
 	go clean -cache -testcache -modcache
 
+# Copy the self-contained Chrome bundle from chromedp/headless-shell
+COPY --from=chrome /headless-shell /headless-shell
+ENV PATH="/headless-shell:${PATH}"
+
 ENV GOTOOLCHAIN=auto
 ENV SKETCH=1