diff --git a/.gitignore b/.gitignore
index 68d2da95bce18..49fa58a946d6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@ docs/AWS_S3_BUCKET
 docs/GIT_BRANCH
 docs/VERSION
 docs/GITCOMMIT
+docs/changed-files
diff --git a/Makefile b/Makefile
index 43a6a11c5eb8d..13e0fa9e8a69a 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ DOCKER_DOCS_IMAGE := docker-docs$(if $(GIT_BRANCH),:$(GIT_BRANCH))
 
 DOCKER_RUN_DOCKER := docker run --rm -it --privileged $(DOCKER_ENVS) $(DOCKER_MOUNT) "$(DOCKER_IMAGE)"
 
-DOCKER_RUN_DOCS := docker run --rm -it $(DOCS_MOUNT) -e AWS_S3_BUCKET
+DOCKER_RUN_DOCS := docker run --rm -it $(DOCS_MOUNT) -e AWS_S3_BUCKET -e NOCACHE
 
 # for some docs workarounds (see below in "docs-build" target)
 GITCOMMIT := $(shell git rev-parse --short HEAD 2>/dev/null)
@@ -83,7 +83,7 @@ build: bundles
 	docker build -t "$(DOCKER_IMAGE)" .
 
 docs-build:
-	git diff --name-status upstream/release..upstream/docs docs/ > docs/changed-files
+	( git remote | grep -v upstream ) || git diff --name-status upstream/release..upstream/docs docs/ > docs/changed-files
 	cp ./VERSION docs/VERSION
 	echo "$(GIT_BRANCH)" > docs/GIT_BRANCH
 	echo "$(AWS_S3_BUCKET)" > docs/AWS_S3_BUCKET
diff --git a/docs/release.sh b/docs/release.sh
index f4f6c552f9d31..de064706bce69 100755
--- a/docs/release.sh
+++ b/docs/release.sh
@@ -78,6 +78,11 @@ upload_current_documentation() {
 	src=site/
 	dst=s3://$BUCKET$1
 
+	cache=max-age=3600
+	if [ "$NOCACHE" ]; then
+		cache=no-cache
+	fi
+
 	echo
 	echo "Uploading $src"
 	echo "  to $dst"
@@ -90,7 +95,7 @@ upload_current_documentation() {
 	#  versions.html_fragment
 		include="--recursive --include \"*.$i\" "
 		echo "uploading *.$i"
-		run="aws s3 cp $src $dst $OPTIONS --profile $BUCKET --cache-control \"max-age=3600\" --acl public-read $include"
+		run="aws s3 cp $src $dst $OPTIONS --profile $BUCKET --cache-control $cache --acl public-read $include"
 		echo "======================="
 		echo "$run"
 		echo "======================="
@@ -114,7 +119,7 @@ invalidate_cache() {
 
 	len=${#files[@]}
 
-	echo "aws cloudfront  create-invalidation --profile docs.docker.com --distribution-id $DISTRIBUTION_ID --invalidation-batch '" > batchfile
+	echo "aws cloudfront  create-invalidation --profile $AWS_S3_BUCKET --distribution-id $DISTRIBUTION_ID --invalidation-batch '" > batchfile
 	echo "{\"Paths\":{\"Quantity\":$len," >> batchfile
 	echo "\"Items\": [" >> batchfile
 
@@ -150,7 +155,7 @@ if [ "$BUILD_ROOT" == "yes" ]; then
 	echo "Building root documentation"
 	build_current_documentation
 	upload_current_documentation
-	invalidate_cache
+	[ "$NOCACHE" ] || invalidate_cache
 fi
 
 #build again with /v1.0/ prefix
@@ -158,4 +163,4 @@ sed -i "s/^site_url:.*/site_url: \/$MAJOR_MINOR\//" mkdocs.yml
 echo "Building the /$MAJOR_MINOR/ documentation"
 build_current_documentation
 upload_current_documentation "/$MAJOR_MINOR/"
-invalidate_cache "/$MAJOR_MINOR"
+[ "$NOCACHE" ] || invalidate_cache "/$MAJOR_MINOR"