diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 95a74972df..b277b6bc06 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -49,11 +49,4 @@ jobs:
           title: 🐛 Lint failed for ${{ github.sha }}
           token: ${{ secrets.GITHUB_TOKEN }}
           labels: kind/bug
-          body: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
-
-  yamllint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Run yamllint make target
-        run: make yamllint
\ No newline at end of file
+          body: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 07698e1de4..62c570f61a 100644
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,7 @@ generate-testdata: ## Update/generate the testdata in $GOPATH/src/sigs.k8s.io/ku
 	./test/testdata/generate.sh
 
 .PHONY: lint
-lint: golangci-lint ## Run golangci-lint linter
+lint: golangci-lint yamllint ## Run golangci-lint linter & yamllint
 	$(GOLANGCI_LINT) run
 
 .PHONY: lint-fix