diff --git a/Dockerfile b/Dockerfile
index 2e9edc1e..1a6892a9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,7 +20,8 @@ WORKDIR /osem/
 RUN bundle config set --local path 'vendor/bundle'; \
     bundle install --jobs=4 --retry=3
 
-# Install our process manager
-RUN gem install foreman
+# Install our process manager / update chromedriver
+RUN gem install foreman; \
+    bundle exec bin/rails webdrivers:chromedriver:update
 
 CMD ["foreman", "start"]
diff --git a/Gemfile b/Gemfile
index ebc72f9e..bb7ba51d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -213,9 +213,7 @@ group :test do
   # as test framework
   gem 'capybara'
   gem 'database_cleaner'
-  gem 'geckodriver-helper'
   gem 'rspec-rails'
-  gem 'webdrivers'
   # for measuring test coverage
   gem 'simplecov-cobertura'
   # for describing models
@@ -239,6 +237,9 @@ group :test do
 end
 
 group :development, :test do
+  # as capybara driver
+  gem 'webdrivers'
+  gem 'geckodriver-helper'
   # as debugger
   gem 'byebug'
   # to test new rails version