diff --git a/.rubocop.yml b/.rubocop.yml
index 71c3b4bd0..e1a7219a2 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -179,8 +179,6 @@ Layout/DotPosition:
 Style/HashEachMethods:
   Enabled: true
 
-# TODO: Enable with Ruby 2.5
-Style/HashTransformKeys:
-  Enabled: false
-Style/HashTransformValues:
+# It makes more sense to allow to structure and group them how it makes sense in the code
+Style/AccessorGrouping:
   Enabled: false
diff --git a/db/migrate/0000_create_schema.rb b/db/migrate/0000_create_schema.rb
index e73953360..cbf0ffc72 100644
--- a/db/migrate/0000_create_schema.rb
+++ b/db/migrate/0000_create_schema.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class CreateSchema < ActiveRecord::Migration[4.2]
-  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/LineLength, Layout/ExtraSpacing
+  # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Layout/LineLength, Layout/ExtraSpacing
   def up
     create_table :account_deletions do |t|
       t.string   :diaspora_handle
@@ -672,5 +672,5 @@ class CreateSchema < ActiveRecord::Migration[4.2]
 
     add_foreign_key :share_visibilities, :users, name: :share_visibilities_user_id_fk, on_delete: :cascade
   end
-  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/LineLength, Layout/ExtraSpacing
+  # rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Layout/LineLength, Layout/ExtraSpacing
 end
diff --git a/docker/develop/Dockerfile b/docker/develop/Dockerfile
index 45617302d..a33f8a08c 100644
--- a/docker/develop/Dockerfile
+++ b/docker/develop/Dockerfile
@@ -20,6 +20,9 @@ RUN DEBIAN_FRONTEND=noninteractive \
         nodejs \
         gosu \
     && \
+    curl https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb -o ./google-chrome.deb && \
+    apt install -y -qq --no-install-recommends ./google-chrome.deb && \
+    rm ./google-chrome.deb && \
     rm -rf /var/lib/apt/lists/*
 
 
diff --git a/spec/javascripts/support/jasmine_helper.rb b/spec/javascripts/support/jasmine_helper.rb
index d424f6875..b25419755 100644
--- a/spec/javascripts/support/jasmine_helper.rb
+++ b/spec/javascripts/support/jasmine_helper.rb
@@ -5,4 +5,7 @@ Jasmine.configure do |config|
   config.runner_browser = :chromeheadless
   config.chrome_startup_timeout = 20
   config.chrome_cli_options["autoplay-policy"] = "no-user-gesture-required"
+  config.chrome_cli_options["disable-gpu"] = nil
+  config.chrome_cli_options["disable-software-rasterizer"] = nil
+  config.chrome_cli_options["disable-dev-shm-usage"] = nil
 end