diff --git a/Dockerfile.prod.go b/Dockerfile.prod.go
index 9f334d82..ffacb2aa 100644
--- a/Dockerfile.prod.go
+++ b/Dockerfile.prod.go
@@ -12,7 +12,12 @@ RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o server cmd/server
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o vault cmd/vault/main.go
 
 FROM alpine:latest
-RUN apk --no-cache add ca-certificates tzdata
+RUN apk --no-cache add ca-certificates tzdata chromium nss freetype harfbuzz ttf-freefont
+
+# Set environment variable for chromedp to find chromium
+ENV CHROME_BIN=/usr/bin/chromium-browser \
+    CHROME_PATH=/usr/bin/chromium-browser
+
 WORKDIR /app
 COPY --from=builder /app/server .
 COPY --from=builder /app/vault .
diff --git a/Dockerfile.stg.go b/Dockerfile.stg.go
index 6d185875..69959ed5 100644
--- a/Dockerfile.stg.go
+++ b/Dockerfile.stg.go
@@ -11,7 +11,12 @@ RUN go mod tidy
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o server cmd/server/main.go
 
 FROM alpine:latest
-RUN apk --no-cache add ca-certificates tzdata
+RUN apk --no-cache add ca-certificates tzdata chromium nss freetype harfbuzz ttf-freefont
+
+# Set environment variable for chromedp to find chromium
+ENV CHROME_BIN=/usr/bin/chromium-browser \
+    CHROME_PATH=/usr/bin/chromium-browser
+
 WORKDIR /app
 COPY --from=builder /app/server .
 COPY go/templates ./templates
diff --git a/go/internal/cmc/pdf/html_generator.go b/go/internal/cmc/pdf/html_generator.go
index 372d00b2..c3cdce05 100644
--- a/go/internal/cmc/pdf/html_generator.go
+++ b/go/internal/cmc/pdf/html_generator.go
@@ -193,15 +193,19 @@ func (g *HTMLDocumentGenerator) GenerateQuotePDF(data *QuotePDFData) (string, er
 	// Generate final PDF filename using quote number
 	quoteNumber := ""
 	if data.Document != nil {
+		log.Printf("=== HTML Generator: Document not nil, CmcReference='%s'", data.Document.CmcReference)
 		quoteNumber = data.Document.CmcReference
 		if data.Document.Revision > 0 {
 			quoteNumber = fmt.Sprintf("%s_%d", quoteNumber, data.Document.Revision)
 		}
+	} else {
+		log.Printf("=== HTML Generator: Document is nil!")
 	}
 	log.Printf("=== HTML Generator: Quote number before fallback: '%s', Document ID: %d, Revision: %d",
 		quoteNumber, data.Document.ID, data.Document.Revision)
 	filenameBase := quoteNumber
 	if filenameBase == "" {
+		log.Printf("=== HTML Generator: Using fallback filename")
 		filenameBase = "CMC Quote"
 	}
 	log.Printf("=== HTML Generator: Final filename base: '%s'", filenameBase)