diff --git a/pkgs/applications/version-management/gitaly/Gemfile b/pkgs/applications/version-management/gitlab/gitaly/Gemfile
similarity index 100%
rename from pkgs/applications/version-management/gitaly/Gemfile
rename to pkgs/applications/version-management/gitlab/gitaly/Gemfile
diff --git a/pkgs/applications/version-management/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
similarity index 100%
rename from pkgs/applications/version-management/gitaly/Gemfile.lock
rename to pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
diff --git a/pkgs/applications/version-management/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
similarity index 100%
rename from pkgs/applications/version-management/gitaly/default.nix
rename to pkgs/applications/version-management/gitlab/gitaly/default.nix
diff --git a/pkgs/applications/version-management/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix
similarity index 100%
rename from pkgs/applications/version-management/gitaly/gemset.nix
rename to pkgs/applications/version-management/gitlab/gitaly/gemset.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e1a9c1081b5..9785302321b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2884,7 +2884,7 @@ with pkgs;
 
   gitlab-workhorse = callPackage ../applications/version-management/gitlab-workhorse { };
 
-  gitaly = callPackage ../applications/version-management/gitaly { };
+  gitaly = callPackage ../applications/version-management/gitlab/gitaly { };
 
   gitstats = callPackage ../applications/version-management/gitstats { };