diff --git a/CHANGELOG.md b/CHANGELOG.md
index f700d1b1f..150782125 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+26.06.2015
+
+* Added new relic license key ta application-example.yml, please update application.yml
+
 22.06.2015
 * Update zonefile
 
diff --git a/Gemfile b/Gemfile
index 4e1c757c1..fc91ac71e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -67,7 +67,7 @@ gem 'data_migrate',
   ref: '35d22b09ff37a4e9d61ab326ad5d8eb0edf1fc81'
 
 # monitors
-gem 'newrelic_rpm', '~> 3.9.9.275'
+gem 'newrelic_rpm', '~> 3.12.0.288'
 
 # country listing
 gem 'countries', '~> 0.10.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 259c87e03..322135254 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -295,7 +295,7 @@ GEM
       railties (>= 3.0)
     multi_json (1.11.1)
     multi_xml (0.5.5)
-    newrelic_rpm (3.9.9.275)
+    newrelic_rpm (3.12.0.288)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     nori (2.6.0)
@@ -563,7 +563,7 @@ DEPENDENCIES
   launchy (~> 2.4.3)
   mina (~> 0.3.1)
   money-rails (~> 1.4.1)
-  newrelic_rpm (~> 3.9.9.275)
+  newrelic_rpm (~> 3.12.0.288)
   nokogiri (~> 1.6.6.2)
   nprogress-rails (~> 0.1.6.7)
   paper_trail!
diff --git a/config/application-example.yml b/config/application-example.yml
index 24a551769..c01412138 100644
--- a/config/application-example.yml
+++ b/config/application-example.yml
@@ -9,6 +9,7 @@ time_zone: 'Tallinn' # more zones by rake time:zones:all
 # New Relic app name, keep only current mode, remove other names.
 # Example: 'Admin, EPP, REPP' will have name 'Admin, EPP, REPP - production' at New Relic.
 new_relic_app_name: 'Admin, EPP, REPP, Registrar, Registrant'
+new_relic_license_key: '42d1c2ba4ed17a9cf6297c59d80e563a3dd3c4fa'
 
 # You can use `rake secret` to generate a secure secret key.
 # Your secret key is used for verifying the integrity of signed cookies.
diff --git a/config/initializers/new_relic_app_name.rb b/config/initializers/new_relic_app_name.rb
deleted file mode 100644
index 662fdf6b1..000000000
--- a/config/initializers/new_relic_app_name.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-if !Rails.env.test? && ENV['new_relic_app_name'].present?
-  require 'newrelic'
-  NewRelic::Agent.config[:app_name] = "#{ENV['new_relic_app_name']} - #{Rails.env}"
-end
diff --git a/config/newrelic.yml b/config/newrelic.yml
index 6dc617a9d..e83d67abd 100644
--- a/config/newrelic.yml
+++ b/config/newrelic.yml
@@ -15,7 +15,7 @@ common: &default_settings
   # You must specify the license key associated with your New Relic
   # account.  This key binds your Agent's data to your account in the
   # New Relic service.
-  license_key: '42d1c2ba4ed17a9cf6297c59d80e563a3dd3c4fa'
+  license_key: <%= ENV['new_relic_license_key'] || '42d1c2ba4ed17a9cf6297c59d80e563a3dd3c4fa' %>
 
   # Agent Enabled (Ruby/Rails Only)
   # Use this setting to force the agent to run or not run.
@@ -49,7 +49,7 @@ common: &default_settings
   # See https://newrelic.com/docs/site/renaming-applications for more details
   # on renaming your New Relic applications.
   #
-  app_name: Registry
+  app_name: <%= "#{ENV['new_relic_app_name']} - #{Rails.env}" %>
 
   # When "true", the agent collects performance data about your
   # application and reports this data to the New Relic service at
@@ -192,7 +192,6 @@ development:
   <<: *default_settings
   # Turn on communication to New Relic service in development mode
   monitor_mode: false
-  app_name: Registry (Development)
 
   # Rails Only - when running in Developer Mode, the New Relic Agent will
   # present performance information on the last 100 transactions you have
@@ -213,7 +212,6 @@ test:
 alpha:
   <<: *default_settings
   monitor_mode: true
-  app_name: Registry (Alpha)
 
 # Many applications have a staging environment which behaves
 # identically to production. Support for that environment is provided
@@ -221,7 +219,6 @@ alpha:
 staging:
   <<: *default_settings
   monitor_mode: true
-  app_name: Registry (Staging)
 
 # Turn on the agent in production for 24x7 monitoring. NewRelic
 # testing shows an average performance impact of < 5 ms per