diff --git a/Rakefile b/Rakefile
index eff8250..8b45475 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
-$LOAD_PATH.unshift File.join(__dir__, 'lib')
-
-require 'bundler'
-env = ENV['APP_ENV'] || 'development'
-Bundler.require(:default, env)
+require_relative 'config/environment'
 
 require 'application_configuration'
 ApplicationConfiguration.load!
@@ -27,7 +23,7 @@ namespace :assets do
 end
 # rubocop:enable Rake/Desc
 
-unless env == 'production'
+unless ENV.fetch('RACK_ENV', 'development') == 'production'
   require 'fileutils'
   require 'haml_lint/rake_task'
   require 'rdoc/task'
diff --git a/config.ru b/config.ru
index b51d6cb..5256b0c 100644
--- a/config.ru
+++ b/config.ru
@@ -1,10 +1,6 @@
 # frozen_string_literal: true
 
-$LOAD_PATH.unshift File.join(__dir__, 'lib')
-
-require 'bundler'
-env = ENV['APP_ENV'] = ENV.fetch('RACK_ENV', 'development')
-Bundler.require(:default, env)
+require_relative 'config/environment'
 
 require 'application_configuration'
 ApplicationConfiguration.load!
@@ -12,5 +8,5 @@ ApplicationConfiguration.load!
 require 'application_assets'
 require 'dev_training_application'
 
-map(ApplicationAssets::ASSET_ROOT) { run ApplicationAssets.new } unless env == 'production'
+map(ApplicationAssets::ASSET_ROOT) { run ApplicationAssets.new } if ENV.fetch('RACK_ENV', 'development') != 'production'
 map('/') { run DevTrainingApplication }
diff --git a/config/deploy.rb b/config/deploy.rb
index 855bf36..cf43434 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -6,11 +6,10 @@
 set :application, 'dev-training-web'
 set :repo_url, 'https://github.com/umts/dev-training-web.git'
 set :branch, 'main'
+set :deploy_to, "/srv/#{fetch :application}"
 
 set :app_env, fetch(:stage)
-set :default_env, { APP_ENV: fetch(:app_env) }
-
-set :deploy_to, "/srv/#{fetch :application}"
+set :default_env, { RACK_ENV: fetch(:app_env) }
 
 set :keep_releases, 5
 
diff --git a/config/environment.rb b/config/environment.rb
new file mode 100644
index 0000000..413c35a
--- /dev/null
+++ b/config/environment.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
+require 'bundler/setup'
+Bundler.require(:default, ENV.fetch('RACK_ENV', 'development'))
diff --git a/coverage/.last_run.json b/coverage/.last_run.json
index ed8dbab..3c48834 100644
--- a/coverage/.last_run.json
+++ b/coverage/.last_run.json
@@ -1,6 +1,6 @@
 {
   "result": {
-    "line": 98.11,
+    "line": 98.13,
     "branch": 85.71
   }
 }
diff --git a/lib/application_configuration.rb b/lib/application_configuration.rb
index a81a7cc..2b80aff 100644
--- a/lib/application_configuration.rb
+++ b/lib/application_configuration.rb
@@ -16,7 +16,7 @@ def self.load!
     Figaro.adapter = Figaro::Application
     Figaro.application = Figaro::Application.new(
       path: config_file,
-      environment: ENV['APP_ENV'] || 'development'
+      environment: ENV['RACK_ENV'] || 'development'
     )
     Figaro.load
   end
diff --git a/script/console b/script/console
index 36e69d7..df34a17 100755
--- a/script/console
+++ b/script/console
@@ -1,10 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'bundler'
-
-$LOAD_PATH.unshift File.join(__dir__, '..', 'lib')
-Bundler.require(:default, :development)
+require_relative '../config/environment'
 
 require 'application_configuration'
 ApplicationConfiguration.load!
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 8b9bbde..62649ff 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
-require 'bundler'
-Bundler.require(:default, :test)
-
+require 'simplecov'
 SimpleCov.start do
   enable_coverage :branch
   load_profile 'test_frameworks'
@@ -10,7 +8,8 @@
   track_files 'lib/**/*.rb'
 end
 
-$LOAD_PATH.unshift File.join(__dir__, '..', 'lib')
+ENV['RACK_ENV'] = 'test'
+require_relative '../config/environment'
 
 Dir.glob(File.join(__dir__, 'support/**/*.rb')).each { |f| require f }