diff --git a/Dockerfile b/Dockerfile
index 3e3335076c..2ff4db8602 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,6 +4,11 @@
 # change is that the Hugo version is now an overridable argument rather than a fixed
 # environment variable.
 
+# Bump this by 1 whenever you change the Dockerfile below, e.g. if
+# `DOCKERFFILE_VERSION=1` then change this to `DOCKERFILE_VERSION=2` when you
+# change something else in this file.
+# DOCKERFILE_VERSION=0
+
 FROM alpine:latest
 
 LABEL maintainer="Luc Perkins <lperkins@linuxfoundation.org>"
diff --git a/Makefile b/Makefile
index c6a411ddd2..149dc9c57e 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,8 @@ NETLIFY_FUNC      = $(NODE_BIN)/netlify-lambda
 # but this can be overridden when calling make, e.g.
 # CONTAINER_ENGINE=podman make container-image
 CONTAINER_ENGINE ?= docker
-CONTAINER_IMAGE   = kubernetes-hugo
+DOCKERFILE_VERSION = $(shell grep DOCKERFILE_VERSION Dockerfile | tail -n 1 | cut -d '=' -f 2 | tr -d " \"\n")
+CONTAINER_IMAGE   = kubernetes-hugo:v$(HUGO_VERSION)-$(DOCKERFILE_VERSION)
 CONTAINER_RUN     = $(CONTAINER_ENGINE) run --rm --interactive --tty --volume $(CURDIR):/src
 
 CCRED=\033[0;31m