diff --git a/.github/workflows/router-ci.yaml b/.github/workflows/router-ci.yaml
index bd4b33eac7..df0537020e 100644
--- a/.github/workflows/router-ci.yaml
+++ b/.github/workflows/router-ci.yaml
@@ -9,6 +9,7 @@ on:
       - 'router-plugin/**/*'
       - 'router-tests/**/*'
       - 'connect/**/*'
+      - 'Makefile'
       - '.github/workflows/router-ci.yaml'
 
 concurrency:
diff --git a/Makefile b/Makefile
index 49942744fb..47d710b198 100644
--- a/Makefile
+++ b/Makefile
@@ -85,18 +85,23 @@ create-demo:
 delete-demo:
 	./scripts/delete-local-demo.sh
 
+build-plugins:
+	$(MAKE) -C demo plugin-build-ci
+
 dev-setup: prerequisites
 	pnpm install
 	pnpm generate
 	make generate-go
 	make infra-up
 	pnpm -r run --filter '!studio' build
+	make build-plugins
 
 dev-setup-no-infra: prerequisites
 	pnpm install
 	pnpm generate
 	make generate-go
 	pnpm -r run --filter '!studio' build
+	make build-plugins
 
 build-pnpm:
 	pnpm install