diff --git a/internal/rubyserver/rubyserver.go b/internal/rubyserver/rubyserver.go
index 475c6a087c9c0c12057520c816e781aaf4e641e6..9cbf1bdf5b159e880908d8eb5963d37ac7d36033 100644
--- a/internal/rubyserver/rubyserver.go
+++ b/internal/rubyserver/rubyserver.go
@@ -109,6 +109,7 @@ func Start() (*Server, error) {
 		"GITALY_RUBY_GIT_BIN_PATH="+command.GitPath(),
 		fmt.Sprintf("GITALY_RUBY_WRITE_BUFFER_SIZE=%d", streamio.WriteBufferSize),
 		fmt.Sprintf("GITALY_RUBY_MAX_COMMIT_OR_TAG_MESSAGE_SIZE=%d", helper.MaxCommitOrTagMessageSize),
+		"GITALY_RUBY_GITLAB_SHELL_PATH="+cfg.GitlabShell.Dir,
 		"GITALY_RUBY_GITALY_BIN_DIR="+cfg.BinDir,
 		"GITALY_VERSION="+version.GetVersion(),
 		"GITALY_GIT_HOOKS_DIR="+hooks.Path())
diff --git a/ruby/gitlab-shell/lib/gitlab_init.rb b/ruby/gitlab-shell/lib/gitlab_init.rb
index 8dc50567a7eb86384cc3be954dbd4e62c73f8b35..08a1048f789197992394af298a9d98eecea18978 100644
--- a/ruby/gitlab-shell/lib/gitlab_init.rb
+++ b/ruby/gitlab-shell/lib/gitlab_init.rb
@@ -1,4 +1,6 @@
-ROOT_PATH = ENV.fetch('GITALY_GITLAB_SHELL_DIR', File.expand_path('..', __dir__))
+# GITLAB_SHELL_DIR has been deprecated
+ROOT_PATH = ENV['GITALY_GITLAB_SHELL_DIR'] || ENV['GITLAB_SHELL_DIR'] || File.expand_path('..', __dir__)
+
 LOG_PATH = ENV.fetch('GITALY_LOG_DIR', "")
 LOG_LEVEL = ENV.fetch('GITALY_LOG_LEVEL', "")
 LOG_FORMAT = ENV.fetch('GITALY_LOG_FORMAT', "")
diff --git a/ruby/lib/gitlab/config.rb b/ruby/lib/gitlab/config.rb
index 8d32924afe0f5c211bd214914fed1b2b7e672e50..2a710b5bb1e3c682b9b92eddeb6512c23b7c47c3 100644
--- a/ruby/lib/gitlab/config.rb
+++ b/ruby/lib/gitlab/config.rb
@@ -41,7 +41,7 @@ module Gitlab
       include TestSetup
 
       def path
-        @path ||= ENV['GITALY_GITLAB_SHELL_DIR']
+        @path ||= ENV['GITALY_GITLAB_SHELL_DIR'] || ENV['GITALY_RUBY_GITLAB_SHELL_PATH']
       end
 
       def git_timeout
diff --git a/ruby/lib/gitlab/git/hook.rb b/ruby/lib/gitlab/git/hook.rb
index a60f30001b656f89aebdcd514f5925edf5f9ff84..3691f8639917157c047db4a2dbee3e6a0941fa6e 100644
--- a/ruby/lib/gitlab/git/hook.rb
+++ b/ruby/lib/gitlab/git/hook.rb
@@ -103,6 +103,7 @@ module Gitlab
       def env_base_vars(gl_id, gl_username)
         {
           'GITALY_GITLAB_SHELL_DIR' => Gitlab.config.gitlab_shell.path,
+          'GITLAB_SHELL_DIR' => Gitlab.config.gitlab_shell.path,
           'GITALY_LOG_DIR' => Gitlab.config.logging.dir,
           'GITALY_LOG_LEVEL' => Gitlab.config.logging.level,
           'GITALY_LOG_FORMAT' => Gitlab.config.logging.format,