diff --git a/content/en/docs/setup/platform-setup/gke/index.md b/content/en/docs/setup/platform-setup/gke/index.md
index 167342588d..cd1e5cbb03 100644
--- a/content/en/docs/setup/platform-setup/gke/index.md
+++ b/content/en/docs/setup/platform-setup/gke/index.md
@@ -14,12 +14,17 @@ Follow these instructions to prepare a GKE cluster for Istio.
 1. Create a new cluster.
 
     {{< text bash >}}
-    $ gcloud container clusters create <cluster-name> \
+    $ export PROJECT_ID=`gcloud config get-value project` && \
+      export M_TYPE=n1-standard-2 && \
+      export ZONE=us-west2-a && \
+      export CLUSTER_NAME=${PROJECT_ID}-${RANDOM} && \
+      gcloud services enable container.googleapis.com && \
+      gcloud container clusters create $CLUSTER_NAME \
       --cluster-version latest \
-      --machine-type=n1-standard-2 \
+      --machine-type=$M_TYPE \
       --num-nodes 4 \
-      --zone <zone> \
-      --project <project-id>
+      --zone $ZONE \
+      --project $PROJECT_ID
     {{< /text >}}
 
     {{< tip >}}
@@ -44,7 +49,7 @@ Follow these instructions to prepare a GKE cluster for Istio.
     To review this firewall rule for master access:
 
     {{< text bash >}}
-    $ gcloud compute firewall-rules list --filter="name~gke-<cluster-name>-[0-9a-z]*-master"
+    $ gcloud compute firewall-rules list --filter="name~gke-${CLUSTER_NAME}-[0-9a-z]*-master"
     {{< /text >}}
 
     To replace the existing rule and allow master access:
@@ -58,9 +63,9 @@ Follow these instructions to prepare a GKE cluster for Istio.
 1. Retrieve your credentials for `kubectl`.
 
     {{< text bash >}}
-    $ gcloud container clusters get-credentials <cluster-name> \
-        --zone <zone> \
-        --project <project-id>
+    $ gcloud container clusters get-credentials $CLUSTER_NAME \
+        --zone $ZONE \
+        --project $PROJECT_ID
     {{< /text >}}
 
 1. Grant cluster administrator (admin) permissions to the current user. To
diff --git a/scripts/build_archive_site.sh b/scripts/build_archive_site.sh
index df995941ee..d20cd761de 100755
--- a/scripts/build_archive_site.sh
+++ b/scripts/build_archive_site.sh
@@ -21,6 +21,8 @@ set -e
 BASEURL="$1"
 
 # List of name:tagOrBranch
+# This is a list of archived versions
+# TODO: rename TOBUILD to ARCHIVED_VERSIONS
 TOBUILD=(
   v1.4:release-1.4
   v1.3:release-1.3