diff --git a/changelogs/unreleased/mrchrisw-fix-check-subgroups.yml b/changelogs/unreleased/mrchrisw-fix-check-subgroups.yml
new file mode 100644
index 0000000000000000000000000000000000000000..940c1c5d41b7d10a458d48d47fb3c94da5be2ab1
--- /dev/null
+++ b/changelogs/unreleased/mrchrisw-fix-check-subgroups.yml
@@ -0,0 +1,4 @@
+---
+title: Update gitlab:repo:check task to support subgroups
+merge_request:
+author:
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index 63c5e9b9c83c28882d00b59b14cb87b388ab78f9..5c2e1764ec1ab0bb3e9e3393926d97a8bc968ba6 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -507,11 +507,9 @@ namespace :gitlab do
     desc "GitLab | Check the integrity of the repositories managed by GitLab"
     task check: :environment do
       Gitlab.config.repositories.storages.each do |name, repository_storage|
-        namespace_dirs = Dir.glob(File.join(repository_storage['path'], '*'))
-
-        namespace_dirs.each do |namespace_dir|
-          repo_dirs = Dir.glob(File.join(namespace_dir, '*'))
-          repo_dirs.each { |repo_dir| check_repo_integrity(repo_dir) }
+        repo_dirs = Dir.glob(File.join(repository_storage['path'], '**/*'))
+        repo_dirs.each do |repo|
+          check_repo_integrity(repo) if repo.end_with?('.git') && File.directory?(repo)
         end
       end
     end