diff --git a/.gitignore b/.gitignore
index 6e4c6575679f..4826d166789b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,3 @@
-# Visual Studio Code
-/.vscode
-!/.vscode/extensions.json
-
 # Intelij-IDEA
 /.idea
 
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 82ec71131d39..854e76f870a8 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -5,6 +5,7 @@
 		"Vue.volar",
 		"Orta.vscode-jest",
 		"mrmlnc.vscode-json5",
-		"github.vscode-github-actions"
+    "github.vscode-github-actions",
+    "redhat.vscode-yaml"
 	]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 0ceec23acd8b..bbb870fb782f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -11,5 +11,14 @@
 	"editor.codeActionsOnSave": {
 		"source.fixAll": "explicit"
 	},
-	"editor.formatOnSave": false
+	"editor.formatOnSave": false,
+	"yaml.schemas": {
+		"https://json.schemastore.org/github-action.json": [
+			".github/actions/**/action.yaml",
+			".github/actions/**/action.yml"
+		],
+		"https://json.schemastore.org/github-issue-config.json": [
+			".github/ISSUE_TEMPLATE/config.yml"
+		]
+	}
 }