diff --git a/.prow.sh b/.prow.sh
index bb2dc457..588dc3a4 100755
--- a/.prow.sh
+++ b/.prow.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -xeuo pipefail
 
-yum -y install jq
+yum -y install jq PyYAML
 make syntax-check
 # And disable the container again until we figure out about Prow -> internal
 # make container
diff --git a/Makefile b/Makefile
index 03262003..5f8013bc 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,11 @@ syntax-check:
 		jq < $${jsonfile} . >/dev/null; \
 		echo "OK"; \
 	done
+	@set -e; for yamlfile in $$(find ${ROOT_DIR} -name '*.yaml' -o -name '*.yml'); do \
+		echo -n "Checking YAML syntax for $${yamlfile}... "; \
+		python -c "import yaml; yaml.safe_load(open('$${yamlfile}'))"; \
+		echo "OK"; \
+	done
 
 .PHONY: repo-refresh
 repo-refresh: