diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index dfb676ca3e8..95a74972df2 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -55,8 +55,5 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: yaml-lint
-        uses: ibiqlik/action-yamllint@v3
-        with:
-          file_or_dir: testdata
-          config_data: "{extends: relaxed, rules: {line-length: {max: 120}}}"
\ No newline at end of file
+      - name: Run yamllint make target
+        run: make yamllint
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 6fa9da4db8a..07698e1de4b 100644
--- a/Makefile
+++ b/Makefile
@@ -79,6 +79,10 @@ lint: golangci-lint ## Run golangci-lint linter
 lint-fix: golangci-lint ## Run golangci-lint linter and perform fixes
 	$(GOLANGCI_LINT) run --fix
 
+.PHONY: yamllint
+yamllint:
+	@docker run --rm $$(tty -s && echo "-it" || echo) -v $(PWD):/data cytopia/yamllint:latest testdata -d "{extends: relaxed, rules: {line-length: {max: 120}}}" --no-warnings
+
 GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
 golangci-lint:
 	@[ -f $(GOLANGCI_LINT) ] || { \
diff --git a/testdata/project-v3-declarative-v1/config/manager/manager.yaml b/testdata/project-v3-declarative-v1/config/manager/manager.yaml
index dbbd19d7cd1..41f751c26fc 100644
--- a/testdata/project-v3-declarative-v1/config/manager/manager.yaml
+++ b/testdata/project-v3-declarative-v1/config/manager/manager.yaml
@@ -37,7 +37,7 @@ spec:
         control-plane: controller-manager
     spec:
       # TODO(user): Uncomment the following code to configure the nodeAffinity expression
-      # according to the platforms which are supported by your solution. 
+      # according to the platforms which are supported by your solution.
       # It is considered best practice to support multiple architectures. You can
       # build your manager image using the makefile target docker-buildx.
       # affinity:
diff --git a/testdata/project-v3-with-metrics/config/manager/manager.yaml b/testdata/project-v3-with-metrics/config/manager/manager.yaml
index 160f8a58ec1..e717685182f 100644
--- a/testdata/project-v3-with-metrics/config/manager/manager.yaml
+++ b/testdata/project-v3-with-metrics/config/manager/manager.yaml
@@ -37,7 +37,7 @@ spec:
         control-plane: controller-manager
     spec:
       # TODO(user): Uncomment the following code to configure the nodeAffinity expression
-      # according to the platforms which are supported by your solution. 
+      # according to the platforms which are supported by your solution.
       # It is considered best practice to support multiple architectures. You can
       # build your manager image using the makefile target docker-buildx.
       # affinity: