diff --git a/vscode-extensions/vscode-concourse/README.md b/vscode-extensions/vscode-concourse/README.md
index ff0f9cdb95..01edaf820d 100644
--- a/vscode-extensions/vscode-concourse/README.md
+++ b/vscode-extensions/vscode-concourse/README.md
@@ -8,8 +8,8 @@ for editing [Concourse](https://concourse-ci.org/) Pipeline and Task configurati
 The Concourse editor automatically activates when the name of the  `.yml` file you are editing 
 follows a certain pattern:
 
-  - `**/*pipeline*.yml` | `**/pipeline/*.yml` : activates support for editing pipelines
-  - `**/ci/**/tasks/*.yml` | `**/*task.yml` : activates support for editing tasks.
+  - `**/*pipeline*.yml` | `**/pipeline/*.yml` | `**/*pipeline*.yaml` | `**/pipeline/*.yaml`: activates support for editing pipelines
+  - `**/ci/**/tasks/*.yml` | `**/*task.yml` |  `**/ci/**/tasks/*.yaml` | `**/*task.yaml` : activates support for editing tasks.
   
 You can also define your own patterns and map them to the language-ids `concourse-pipeline-yaml` 
 or `concourse-task-yaml` by defining `files.associations` in workspace settings. 
diff --git a/vscode-extensions/vscode-concourse/package.json b/vscode-extensions/vscode-concourse/package.json
index 6896acd2da..55696865bd 100644
--- a/vscode-extensions/vscode-concourse/package.json
+++ b/vscode-extensions/vscode-concourse/package.json
@@ -70,7 +70,9 @@
         ],
         "filenamePatterns": [
           "*pipeline*.yml",
-          "**/pipeline/*.yml"
+          "**/pipeline/*.yml",
+          "*pipeline*.yaml",
+          "**/pipeline/*.yaml"
         ],
         "firstLine": "^#(\\s)*pipeline(\\s)*",
         "configuration": "./yaml-support/language-configuration.json"
@@ -84,7 +86,11 @@
           "**/ci/*task.yml",
           "**/ci/**/tasks/*.yml",
           "**/concourse/*task.yml",
-          "**/concourse/**/tasks/*.yml"
+          "**/concourse/**/tasks/*.yml",
+          "**/ci/*task.yaml",
+          "**/ci/**/tasks/*.yaml",
+          "**/concourse/*task.yaml",
+          "**/concourse/**/tasks/*.yaml"
         ],
         "firstLine": "^#(\\s)*task(\\s)*",
         "configuration": "./yaml-support/language-configuration.json"