diff --git a/Gemfile.lock b/Gemfile.lock
index 6614896ce..6a7480ce9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -338,8 +338,10 @@ GEM
     simple_form (3.1.0)
       actionpack (~> 4.0)
       activemodel (~> 4.0)
-    skylight (1.5.0)
-      activesupport (>= 3.0.0)
+    skylight (2.0.1)
+      skylight-core (= 2.0.1)
+    skylight-core (2.0.1)
+      activesupport (>= 4.2.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
diff --git a/config/application.rb b/config/application.rb
index 97613f125..ba1728b8e 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -28,5 +28,9 @@ class Application < Rails::Application
 
     # This tells Rails to serve error pages from the app itself, rather than using static error pages in public/
     config.exceptions_app = self.routes
+
+    # Activate the Skylight agent in staging. You need to provision the
+    # SKYLIGHT_AUTHENTICATION env var for this to work.
+    config.skylight.environments += ["staging"]
   end
 end