diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb
index 3d25478840d..eb5c7e74058 100644
--- a/config/initializers/1_settings.rb
+++ b/config/initializers/1_settings.rb
@@ -78,5 +78,5 @@ Settings.git['max_size']  ||= 5242880 # 5.megabytes
 Settings.git['bin_path']  ||= '/usr/bin/git'
 Settings.git['timeout']   ||= 10
 
-Settings['satellites'] ||= {}
-Settings.satellites['path']   ||= '/home/gitlab/gitlab/tmp/repo_satellites/'
+Settings['satellites'] ||= Settingslogic.new({})
+Settings.satellites['path'] ||= Rails.root.join('tmp/repo_satellites/')