diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index e8d77d395a..fea1d8007a 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -3,6 +3,7 @@
 	// for the documentation about the extensions.json format
 	"recommendations": [
 		"dbaeumer.vscode-eslint",
-		"EditorConfig.EditorConfig"
+		"EditorConfig.EditorConfig",
+		"redhat.vscode-yaml"
 	]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index ff21db52b6..df5bd10128 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -80,4 +80,7 @@
 	},
 	"typescript.tsc.autoDetect": "off",
 	"testing.autoRun.mode": "rerun",
+	"yaml.schemas": {
+		"https://raw.githubusercontent.com/microsoft/azure-pipelines-vscode/master/service-schema.json": "build/azure-pipelines/**/*.yml"
+	},
 }