diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml
index 9abf9654a..2209c197f 100644
--- a/.github/workflows/default.yml
+++ b/.github/workflows/default.yml
@@ -27,14 +27,8 @@ jobs:
       - name: Assets
         run: make assets
 
-      - name: Format & Tidy
-        run: |
-          gofmt -w -l $(find . -name '*.go')
-          go mod tidy
-
       - name: Porcelain
-        run: |
-          test -z "$(git status --porcelain)" || (git status; git diff; false)
+        run: make porcelain
 
   build:
     name: Build
diff --git a/Makefile b/Makefile
index ed58c875b..b3df1b908 100644
--- a/Makefile
+++ b/Makefile
@@ -64,6 +64,11 @@ test:
 	@echo "Running testsuite"
 	go test $(BUILD_TAGS) ./...
 
+porcelain:
+	gofmt -w -l $$(find . -name '*.go')
+	go mod tidy
+	test -z "$$(git status --porcelain)" || (git status; git diff; false)
+
 build:
 	@echo Version: $(VERSION) $(SHA) $(BUILD_DATE)
 	go build -v $(BUILD_TAGS) $(BUILD_ARGS)