diff --git a/app/lib/bbb_api.rb b/app/lib/bbb_api.rb
index 61aaa257..539d085c 100644
--- a/app/lib/bbb_api.rb
+++ b/app/lib/bbb_api.rb
@@ -1,10 +1,10 @@
 module BbbApi
   def bbb_endpoint
-    Rails.application.secrets[:bbb_endpoint]
+    Rails.configuration.bigbluebutton_endpoint
   end
 
   def bbb_secret
-    Rails.application.secrets[:bbb_secret]
+    Rails.configuration.bigbluebutton_secret
   end
 
   def bbb
diff --git a/config/application.rb b/config/application.rb
index 208bb5f2..46c4accf 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -11,5 +11,8 @@ module Greenlight
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded.
+
+    config.bigbluebutton_endpoint = ENV['BIGBLUEBUTTON_ENDPOINT']
+    config.bigbluebutton_secret = ENV['BIGBLUEBUTTON_SECRET']
   end
 end
diff --git a/config/secrets.yml b/config/secrets.yml
index 429a2d23..195bfb97 100644
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -10,20 +10,13 @@
 # Make sure the secrets in this file are kept private
 # if you're sharing your code publicly.
 
-default: &default
-  bbb_endpoint: <%= ENV['BIGBLUEBUTTON_ENDPOINT'] %>
-  bbb_secret: <%= ENV['BIGBLUEBUTTON_SECRET'] %>
-
 development:
-  <<: *default
   secret_key_base: d7d93ffde4e0eb407fd82d5ae207445834d2cef5acbfc2d42fa10be44f94a8342c82d2c9b4785e1e2ec9d135b7cd3dda443ea3da732ffb8ba182368f0909cfa5
 
 test:
-  <<: *default
   secret_key_base: 16b4c8a9b05f13aa2430fbe55cc675a7b323deedaceb761e6fbb5aace1353354b14813ad58e71db07e5345934713bcf3401c62dce79696574ddece2b5360d953
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.
 production:
-  <<: *default
   secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>