1 files changed, 6 insertions, 2 deletions
diff --git a/lib/gitlab/tracking/standard_context.rb b/lib/gitlab/tracking/standard_context.rb
index 92fdd008249..8ce16c11267 100644
--- a/lib/gitlab/tracking/standard_context.rb
+++ b/lib/gitlab/tracking/standard_context.rb
@@ -15,10 +15,14 @@ module Gitlab
       end
 
       def environment
-        return 'production' if Gitlab.com_and_canary?
-
         return 'staging' if Gitlab.staging?
 
+        return 'production' if Gitlab.com?
+
+        return 'org' if Gitlab.org?
+
+        return 'self-managed' if Rails.env.production?
+
         'development'
       end