diff --git a/Dockerfile.prod.go b/Dockerfile.prod.go
index 7126ee55..3bc627f4 100644
--- a/Dockerfile.prod.go
+++ b/Dockerfile.prod.go
@@ -21,7 +21,8 @@ ENV CHROME_BIN=/usr/bin/chromium-browser \
 WORKDIR /app
 COPY --from=builder /app/server .
 COPY --from=builder /app/vault .
-COPY go/internal/cmc/pdf/templates ./templates
+COPY go/templates ./templates
+COPY go/internal/cmc/pdf/templates ./templates/pdf
 COPY go/static ./static
 COPY go/.env.example .env
 EXPOSE 8082
diff --git a/Dockerfile.stg.go b/Dockerfile.stg.go
index c4fbe440..dc4ab5bf 100644
--- a/Dockerfile.stg.go
+++ b/Dockerfile.stg.go
@@ -19,7 +19,8 @@ ENV CHROME_BIN=/usr/bin/chromium-browser \
 
 WORKDIR /app
 COPY --from=builder /app/server .
-COPY go/internal/cmc/pdf/templates ./templates
+COPY go/templates ./templates
+COPY go/internal/cmc/pdf/templates ./templates/pdf
 COPY go/static ./static
 COPY go/.env.example .env
 EXPOSE 8082
diff --git a/go/internal/cmc/pdf/invoice_builder.go b/go/internal/cmc/pdf/invoice_builder.go
index 2960cc6f..b0543765 100644
--- a/go/internal/cmc/pdf/invoice_builder.go
+++ b/go/internal/cmc/pdf/invoice_builder.go
@@ -118,6 +118,14 @@ func (g *HTMLDocumentGenerator) BuildInvoiceHTML(data *InvoicePDFData, totalPage
 			filepath.Join("go", "internal", "cmc", "pdf", "templates", "invoice.html"),
 			filepath.Join("go", "internal", "cmc", "pdf", "templates", "header.html"),
 		},
+		{
+			filepath.Join("templates", "pdf", "invoice.html"),
+			filepath.Join("templates", "pdf", "header.html"),
+		},
+		{
+			"/app/templates/pdf/invoice.html",
+			"/app/templates/pdf/header.html",
+		},
 		{
 			filepath.Join("templates", "invoice.html"),
 			filepath.Join("templates", "header.html"),
diff --git a/go/internal/cmc/pdf/quote_builder.go b/go/internal/cmc/pdf/quote_builder.go
index a4f9d82d..23a84a1a 100644
--- a/go/internal/cmc/pdf/quote_builder.go
+++ b/go/internal/cmc/pdf/quote_builder.go
@@ -168,6 +168,14 @@ func (g *HTMLDocumentGenerator) BuildQuoteHTML(data *QuotePDFData, totalPages in
 			filepath.Join("go", "internal", "cmc", "pdf", "templates", "quote.html"),
 			filepath.Join("go", "internal", "cmc", "pdf", "templates", "header.html"),
 		},
+		{
+			filepath.Join("templates", "pdf", "quote.html"),
+			filepath.Join("templates", "pdf", "header.html"),
+		},
+		{
+			"/app/templates/pdf/quote.html",
+			"/app/templates/pdf/header.html",
+		},
 		{
 			filepath.Join("templates", "quote.html"),
 			filepath.Join("templates", "header.html"),
diff --git a/go/server b/go/server
index a757c2b4..62ce489c 100755
Binary files a/go/server and b/go/server differ