diff --git a/docker/lib/dependabot/docker/file_fetcher.rb b/docker/lib/dependabot/docker/file_fetcher.rb
index 86fe86844ed..e0bb1267344 100644
--- a/docker/lib/dependabot/docker/file_fetcher.rb
+++ b/docker/lib/dependabot/docker/file_fetcher.rb
@@ -9,7 +9,7 @@ module Docker
     class FileFetcher < Dependabot::FileFetchers::Base
       YAML_REGEXP = /^[^\.]+\.ya?ml$/i
       DOCKER_REGEXP = /dockerfile/i
-      HELM_REGEXP = /values[\-a-zA-Z_0-9]*\.yaml/i
+      HELM_REGEXP = /values[\-a-zA-Z_0-9]*\.ya?ml$/i
 
       def self.required_files_in?(filenames)
         filenames.any? { |f| f.match?(DOCKER_REGEXP) } or
diff --git a/docker/spec/dependabot/docker/file_fetcher_spec.rb b/docker/spec/dependabot/docker/file_fetcher_spec.rb
index 8d50d36e9ec..acb444010be 100644
--- a/docker/spec/dependabot/docker/file_fetcher_spec.rb
+++ b/docker/spec/dependabot/docker/file_fetcher_spec.rb
@@ -271,10 +271,14 @@
 
     context "with a Helm values file" do
       matching_filenames = [
+        "other-values.yml",
         "other-values.yaml",
+        "values.yml",
         "values.yaml",
-        "values2.yaml",
-        "values_other.yaml"
+        "values_other.yml",
+        "values_other.yaml",
+        "values2.yml",
+        "values2.yaml"
       ]
 
       before do
@@ -301,7 +305,7 @@
       let(:options) { { kubernetes_updates: true } }
 
       it "fetches the values.yaml" do
-        expect(file_fetcher_instance.files.count).to eq(4)
+        expect(file_fetcher_instance.files.count).to eq(matching_filenames.length)
         expect(file_fetcher_instance.files.map(&:name)).
           to match_array(matching_filenames)
       end
diff --git a/docker/spec/fixtures/github/contents_helm_repo.json b/docker/spec/fixtures/github/contents_helm_repo.json
index 6dd7d3f53a6..a3633c4ae43 100644
--- a/docker/spec/fixtures/github/contents_helm_repo.json
+++ b/docker/spec/fixtures/github/contents_helm_repo.json
@@ -96,8 +96,8 @@
     }
   },
   {
-    "name": "values.yaml",
-    "path": "values.yaml",
+    "name": "other-values.yml",
+    "path": "other-values.yml",
     "sha": "311f9743315183cc6751313cb251cfeb3de45c1a",
     "size": 4927,
     "url": "https://api.github.com/repos/dependabot/dependabot-core/contents/Dockerfile?ref=master",
@@ -127,6 +127,54 @@
       "html": "https://github.com/dependabot/dependabot-core/blob/main/Dockerfile"
     }
   },
+  {
+    "name": "values.yml",
+    "path": "values.yml",
+    "sha": "311f9743315183cc6751313cb251cfeb3de45c1a",
+    "size": 4927,
+    "url": "https://api.github.com/repos/dependabot/dependabot-core/contents/Dockerfile?ref=master",
+    "html_url": "https://github.com/dependabot/dependabot-core/blob/main/Dockerfile",
+    "git_url": "https://api.github.com/repos/dependabot/dependabot-core/git/blobs/311f9743315183cc6751313cb251cfeb3de45c1a",
+    "download_url": "https://raw.githubusercontent.com/dependabot/dependabot-core/master/Dockerfile",
+    "type": "file",
+    "_links": {
+      "self": "https://api.github.com/repos/dependabot/dependabot-core/contents/Dockerfile?ref=master",
+      "git": "https://api.github.com/repos/dependabot/dependabot-core/git/blobs/311f9743315183cc6751313cb251cfeb3de45c1a",
+      "html": "https://github.com/dependabot/dependabot-core/blob/main/Dockerfile"
+    }
+  },
+  {
+    "name": "values.yaml",
+    "path": "values.yaml",
+    "sha": "311f9743315183cc6751313cb251cfeb3de45c1a",
+    "size": 4927,
+    "url": "https://api.github.com/repos/dependabot/dependabot-core/contents/Dockerfile?ref=master",
+    "html_url": "https://github.com/dependabot/dependabot-core/blob/main/Dockerfile",
+    "git_url": "https://api.github.com/repos/dependabot/dependabot-core/git/blobs/311f9743315183cc6751313cb251cfeb3de45c1a",
+    "download_url": "https://raw.githubusercontent.com/dependabot/dependabot-core/master/Dockerfile",
+    "type": "file",
+    "_links": {
+      "self": "https://api.github.com/repos/dependabot/dependabot-core/contents/Dockerfile?ref=master",
+      "git": "https://api.github.com/repos/dependabot/dependabot-core/git/blobs/311f9743315183cc6751313cb251cfeb3de45c1a",
+      "html": "https://github.com/dependabot/dependabot-core/blob/main/Dockerfile"
+    }
+  },
+  {
+    "name": "values_other.yml",
+    "path": "values_other.yml",
+    "sha": "311f9743315183cc6751313cb251cfeb3de45c1a",
+    "size": 4927,
+    "url": "https://api.github.com/repos/dependabot/dependabot-core/contents/Dockerfile?ref=master",
+    "html_url": "https://github.com/dependabot/dependabot-core/blob/main/Dockerfile",
+    "git_url": "https://api.github.com/repos/dependabot/dependabot-core/git/blobs/311f9743315183cc6751313cb251cfeb3de45c1a",
+    "download_url": "https://raw.githubusercontent.com/dependabot/dependabot-core/master/Dockerfile",
+    "type": "file",
+    "_links": {
+      "self": "https://api.github.com/repos/dependabot/dependabot-core/contents/Dockerfile?ref=master",
+      "git": "https://api.github.com/repos/dependabot/dependabot-core/git/blobs/311f9743315183cc6751313cb251cfeb3de45c1a",
+      "html": "https://github.com/dependabot/dependabot-core/blob/main/Dockerfile"
+    }
+  },
   {
     "name": "values_other.yaml",
     "path": "values_other.yaml",
@@ -143,6 +191,22 @@
       "html": "https://github.com/dependabot/dependabot-core/blob/main/Dockerfile"
     }
   },
+  {
+    "name": "values2.yml",
+    "path": "values2.yml",
+    "sha": "311f9743315183cc6751313cb251cfeb3de45c1a",
+    "size": 4927,
+    "url": "https://api.github.com/repos/dependabot/dependabot-core/contents/Dockerfile?ref=master",
+    "html_url": "https://github.com/dependabot/dependabot-core/blob/main/Dockerfile",
+    "git_url": "https://api.github.com/repos/dependabot/dependabot-core/git/blobs/311f9743315183cc6751313cb251cfeb3de45c1a",
+    "download_url": "https://raw.githubusercontent.com/dependabot/dependabot-core/master/Dockerfile",
+    "type": "file",
+    "_links": {
+      "self": "https://api.github.com/repos/dependabot/dependabot-core/contents/Dockerfile?ref=master",
+      "git": "https://api.github.com/repos/dependabot/dependabot-core/git/blobs/311f9743315183cc6751313cb251cfeb3de45c1a",
+      "html": "https://github.com/dependabot/dependabot-core/blob/main/Dockerfile"
+    }
+  },
   {
     "name": "values2.yaml",
     "path": "values2.yaml",
@@ -272,4 +336,3 @@
     }
   }
 ]
-
diff --git a/docker/spec/fixtures/github/contents_values_yaml.json b/docker/spec/fixtures/github/contents_values_yaml.json
index 8a694eef339..bca2b74f052 100644
--- a/docker/spec/fixtures/github/contents_values_yaml.json
+++ b/docker/spec/fixtures/github/contents_values_yaml.json
@@ -16,4 +16,3 @@
     "html": "https://github.com/dependabot/dependabot-core/blob/main/values.yaml"
   }
 }
-