diff --git a/Dockerfile b/Dockerfile
index 78cfa5d..bece413 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,9 @@
 #   Build and extract artifacts directly:
 #     docker buildx build . --output artifacts
 #
+#   Build with tests (typecheck + lint):
+#     docker build --build-arg RUN_TESTS=true -t rentgen .
+#
 #   Or traditional build (creates full development environment):
 #     docker build -t rentgen .
 #     docker run --rm rentgen ls -lh /app/web-ext-artifacts/
@@ -15,6 +18,9 @@
 # Build stage
 FROM node:lts AS builder
 
+# Optional: run tests during build (typecheck + lint)
+ARG RUN_TESTS=false
+
 WORKDIR /app
 
 # Copy package files for dependency installation (better layer caching)
@@ -32,6 +38,14 @@ RUN npm run build
 # Create the package
 RUN npm run create-package
 
+# Optional: run quality checks
+RUN if [ "$RUN_TESTS" = "true" ]; then \
+        echo "Running TypeScript type checking..."; \
+        npm run typecheck; \
+        echo "Running web-ext lint..."; \
+        npm run lint; \
+    fi
+
 # Artifacts stage - only contains the built artifacts (for --output)
 FROM scratch AS artifacts