diff --git a/Configuration.md b/Configuration.md
index 753001a..4bd418e 100644
--- a/Configuration.md
+++ b/Configuration.md
@@ -25,6 +25,8 @@
 * `HOSTED_ZONE_NAME`: Optional. Name of the hosted zone. `mycompany.com` by default.
 * `GERRIT_KEY_PREFIX` : Optional. Secrets prefix used during the [Import into AWS Secret Manager](#import-into-aws-secret-manager).
   `gerrit_secret` by default.
+* `GERRIT_BUILD_NO_CACHE`: Optional. Don't use the Docker build cache when building the Gerrit image.
+  Any non-zero length string will set this. Unset by default, so the cache is used.
 
 #### Scheduled Git Garbage Collection
 
diff --git a/gerrit/Makefile b/gerrit/Makefile
index e2a3bd4..9455b01 100644
--- a/gerrit/Makefile
+++ b/gerrit/Makefile
@@ -44,7 +44,13 @@
 	done
 
 gerrit-build: check-gerrit-version-vs-war-url
-	docker build \
+	if [[ "$(GERRIT_BUILD_NO_CACHE)" ]]; \
+	then \
+		export build_args="--no-cache"; \
+	else \
+		export build_args=""; \
+	fi; \
+	docker build $${build_args} \
 		--build-arg withXRay="$(XRAY_ENABLED)" \
 		--build-arg GERRIT_VERSION=$(GERRIT_VERSION) \
 		--build-arg GERRIT_PATCH=$(GERRIT_PATCH) \