diff --git a/Makefile b/Makefile
index 767986c..c09413a 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ dist/personal-measure-api.tar.gz:
 
 dist/personal-measure-web.tar.gz:
 	-mkdir dist
-	(cd web && npm run build)
+	TARGET_ENV=$(TARGET_ENV) make -C web build
 	tar czf dist/personal-measure-web-${VERSION}.tar.gz -C web/dist .
 	cp dist/personal-measure-web-${VERSION}.tar.gz dist/personal-measure-web.tar.gz
 
@@ -27,6 +27,7 @@ deploy-web: dist/personal-measure-web.tar.gz
 	mkdir -p temp-deploy/personal-measure-web-${VERSION}
 	tar xzf dist/personal-measure-web-${VERSION}.tar.gz -C temp-deploy/personal-measure-web-${VERSION}
 	aws s3 sync temp-deploy/personal-measure-web-${VERSION} s3://pm.jdb-labs.com/$(TARGET_ENV)/webroot
+	TARGET_ENV=${TARGET_ENV} operations/invalidate-cdn-cache.sh
 	rm -r temp-deploy
 
 deploy: deploy-api deploy-web
diff --git a/api/src/util/bash/client.sh b/api/src/util/bash/client.sh
index d7baae1..d17a28d 100755
--- a/api/src/util/bash/client.sh
+++ b/api/src/util/bash/client.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-host="${PM_API_HOST:-localhost:8081}"
+api_base_url="${PM_API_BASE_URL:-http://localhost:8081}"
 if [ $# -eq 1 ]; then
   url="$1"
   method="GET"
@@ -19,6 +19,6 @@ curl -s -X "$method" \
   -H "Content-Type: application/json" \
   -H "Authorization: $(cat credential)" \
   -H "Origin: https://curl.localhost" \
-  "http://${host}/api/$url" \
+  "${api_base_url}/api/$url" \
   -d "$data" \
   -v
diff --git a/operations/invalidate-cdn-cache.sh b/operations/invalidate-cdn-cache.sh
new file mode 100755
index 0000000..6eec34b
--- /dev/null
+++ b/operations/invalidate-cdn-cache.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+echo "Looking up CloudFront distribution ID for Personal Measure ${TARGET_ENV} environment."
+cloudfront_distribution_id=$(\
+  aws cloudfront list-distributions \
+    --query "DistributionList.Items[?starts_with(Comment, 'Personal Measure ${TARGET_ENV}')].Id | [0]" \
+  | sed -e 's/^"//' -e 's/"$//'
+)
+
+if [[ -z "${cloudfront_distribution_id}" ]]; then
+  >&2 echo "Unable to find CloudFront distribution for domain ${TARGET_ENV}."
+  exit 3
+fi
+
+echo "Found distribution ID ${cloudfront_distribution_id}."
+
+echo "Invalidating the CloudFront cache for ${TARGET_ENV}."
+invalidation_id=$(aws cloudfront create-invalidation \
+  --query 'Invalidation.Id' \
+  --distribution-id "${cloudfront_distribution_id}" \
+  --paths '/index.html')
+
+if [[ $? -ne 0 || -z "${invalidation_id}" ]]; then
+  >&2 echo "Unable to create the CloudFront invalidation."
+else
+  echo "Successfully created invalidation ${invalidation_id}."
+fi
+
+echo "Done."