diff --git a/hack/make-release-artifacts.sh b/hack/make-release-artifacts.sh
index d769e7a..d508f53 100755
--- a/hack/make-release-artifacts.sh
+++ b/hack/make-release-artifacts.sh
@@ -31,6 +31,7 @@ NODE_SELECTOR_KEY="${NODE_SELECTOR_KEY:--}"
 NODE_SELECTOR_VALUE="${NODE_SELECTOR_VALUE:--}"
 TOLERATION_KEY="${TOLERATION_KEY:--}"
 TOLERATION_VALUE="${TOLERATION_VALUE:--}"
+FRONTEND_EXTRA_HEADERS="${FRONTEND_EXTRA_HEADERS:-}"
 
 print_license_header() {
     cat "${SCRIPTDIR}/license_header.txt"
@@ -98,6 +99,11 @@ mk_kubernetes_manifests() {
         out_manifest="$(gsed -r "s|$pattern|$replace|g" <(echo "${out_manifest}") )"
     fi
 
+    # insert FRONTEND_EXTRA_HEADERS
+    pattern="^(\s*)- name: FRONTEND_EXTRA_HEADERS"
+    replace="\1- name: FRONTEND_EXTRA_HEADERS\n\1  value: \"${FRONTEND_EXTRA_HEADERS}\""
+    out_manifest="$(gsed -r "s|$pattern|$replace|g" <(echo "${out_manifest}") )"
+
     # substitude loadgenerator port: 8089 -> 80
     pattern="^(\s*)port:\s+8089(\s*)"
     replace="\1port: 80\2"
diff --git a/kubernetes-manifests/frontend.yaml b/kubernetes-manifests/frontend.yaml
index 0dec07d..8c21b51 100644
--- a/kubernetes-manifests/frontend.yaml
+++ b/kubernetes-manifests/frontend.yaml
@@ -67,6 +67,7 @@ spec:
             value: "checkoutservice:5050"
           - name: AD_SERVICE_ADDR
             value: "adservice:9555"
+          - name: FRONTEND_EXTRA_HEADERS
           - name: ENV_PLATFORM
             value: "gcp"
           - name: NODE_NAME
diff --git a/src/frontend/handlers.go b/src/frontend/handlers.go
index 3bbf9a5..63b3c29 100644
--- a/src/frontend/handlers.go
+++ b/src/frontend/handlers.go
@@ -95,7 +95,7 @@ func (fe *frontendServer) homeHandler(w http.ResponseWriter, r *http.Request) {
 		"ad":            fe.chooseAd(r.Context(), []string{}, log),
 		"platform_css":  plat.css,
 		"platform_name": plat.provider,
-		"extra_headers": template.HTML(os.Getenv("EXTRA_HEADERS")),
+		"extra_headers": template.HTML(os.Getenv("FRONTEND_EXTRA_HEADERS")),
 	}); err != nil {
 		log.Error(err)
 	}
@@ -172,7 +172,7 @@ func (fe *frontendServer) productHandler(w http.ResponseWriter, r *http.Request)
 		"cart_size":       cartSize(cart),
 		"platform_css":    plat.css,
 		"platform_name":   plat.provider,
-		"extra_headers": template.HTML(os.Getenv("EXTRA_HEADERS")),
+		"extra_headers":   template.HTML(os.Getenv("FRONTEND_EXTRA_HEADERS")),
 	}); err != nil {
 		log.Println(err)
 	}
@@ -284,7 +284,7 @@ func (fe *frontendServer) viewCartHandler(w http.ResponseWriter, r *http.Request
 		"expiration_years": []int{year, year + 1, year + 2, year + 3, year + 4},
 		"platform_css":     plat.css,
 		"platform_name":    plat.provider,
-		"extra_headers": template.HTML(os.Getenv("EXTRA_HEADERS")),
+		"extra_headers":    template.HTML(os.Getenv("FRONTEND_EXTRA_HEADERS")),
 	}); err != nil {
 		log.Println(err)
 	}
@@ -354,7 +354,7 @@ func (fe *frontendServer) placeOrderHandler(w http.ResponseWriter, r *http.Reque
 		"recommendations": recommendations,
 		"platform_css":    plat.css,
 		"platform_name":   plat.provider,
-		"extra_headers": template.HTML(os.Getenv("EXTRA_HEADERS")),
+		"extra_headers":   template.HTML(os.Getenv("FRONTEND_EXTRA_HEADERS")),
 	}); err != nil {
 		log.Println(err)
 	}
@@ -410,12 +410,12 @@ func renderHTTPError(log logrus.FieldLogger, r *http.Request, w http.ResponseWri
 
 	w.WriteHeader(code)
 	templates.ExecuteTemplate(w, "error", map[string]interface{}{
-		"session_id":  sessionID(r),
-		"request_id":  r.Context().Value(ctxKeyRequestID{}),
-		"error":       errMsg,
-		"status_code": code,
-		"extra_headers": template.HTML(os.Getenv("EXTRA_HEADERS")),
-		"status":      http.StatusText(code)})
+		"session_id":    sessionID(r),
+		"request_id":    r.Context().Value(ctxKeyRequestID{}),
+		"error":         errMsg,
+		"status_code":   code,
+		"extra_headers": template.HTML(os.Getenv("FRONTEND_EXTRA_HEADERS")),
+		"status":        http.StatusText(code)})
 }
 
 func currentCurrency(r *http.Request) string {