diff --git a/Capfile b/Capfile
index a0b2bee..360b373 100644
--- a/Capfile
+++ b/Capfile
@@ -5,6 +5,7 @@ require 'capistrano/setup'
 require 'capistrano/deploy'
 
 require 'capistrano/rails'
+#require 'capistrano/rbenv'
 require 'capistrano/rvm'
 
 # Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
diff --git a/Gemfile b/Gemfile
index 9e58579..05f47fb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,9 +4,6 @@ source 'https://rubygems.org'
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '4.2'
 
-# Use sqlite3 as the database for Active Record
-gem 'sqlite3'
-
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 4.0.3'
 gem 'bootstrap-sass',       '3.2.0.0'
@@ -44,21 +41,25 @@ group :test do
 end
 
 group :development do
-  gem 'annotate'
-end
+  # Use sqlite3 as the database for Active Record
+  gem 'sqlite3'
 
-# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
-gem 'spring',        group: :development
+  gem 'annotate'
+
+  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+  gem 'spring'
+
+  # Deployment
+  gem 'capistrano', '~> 3.1'
+  gem 'capistrano-rails', '~> 1.1'
+  gem 'capistrano-rvm'
+  gem 'capistrano-rbenv'
+  gem 'capistrano-passenger'
+end
 
 # Airbrake
 gem 'airbrake'
 
-# Deployment
-gem 'capistrano', '~> 3.1'
-gem 'capistrano-rails', '~> 1.1'
-gem 'capistrano-rvm'
-gem 'capistrano-passenger'
-
 # Generate seed data
 gem 'faker', '1.4.2'
 
diff --git a/config/deploy/king.rb b/config/deploy/king.rb
index c547783..c6198e1 100644
--- a/config/deploy/king.rb
+++ b/config/deploy/king.rb
@@ -6,3 +6,5 @@ server 'king.ugent.be', user: 'tab', roles: %w{web app db},
 }
 
 set :rails_env, 'production'
+set :rbenv_type, :system
+set :rbenv_ruby, File.read('.ruby-version').strip