diff --git a/cmd/golangorg/app.prod.yaml b/cmd/golangorg/app.prod.yaml
index d9cdadf..9716567 100644
--- a/cmd/golangorg/app.prod.yaml
+++ b/cmd/golangorg/app.prod.yaml
@@ -5,6 +5,8 @@
 env_variables:
   GOLANGORG_PROD: true
   GOLANGORG_ENFORCE_HOSTS: true
+  GODOC_PROD: true                    # TODO: remove in the future
+  GODOC_ENFORCE_HOSTS: true           # TODO: remove in the future
   GOLANGORG_REDIS_ADDR: 10.0.0.4:6379 # instance "gophercache"
   GOLANGORG_ANALYTICS: UA-11222381-2
   DATASTORE_PROJECT_ID: golang-org