diff --git a/Gemfile b/Gemfile
index ad65996550..ef75675d21 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,7 @@ gem 'awesome_nested_set'
 gem 'ransack', '2.4.1'
 gem 'responders'
 gem 'sass', '~> 3.4.0' # this restriction originates from foundation-rails's version
-gem 'sass-rails', '< 6.0.0'
+gem 'sass-rails', '< 5.1.0' # this restriction originates from the compass-rails's version
 
 gem 'i18n'
 gem 'i18n-js', '~> 3.8.3'
@@ -20,8 +20,8 @@ gem 'rails-i18n'
 gem 'rails_safe_tasks', '~> 1.0'
 
 gem "activerecord-import"
-#gem "db2fog", github: "openfoodfoundation/db2fog", branch: "rails-6"
-gem "fog-aws", ">= 0.6.0"
+gem "db2fog", github: "openfoodfoundation/db2fog", branch: "rails-6"
+gem "fog-aws", "~> 2.0" # db2fog does not support v3
 
 gem "catalog", path: "./engines/catalog"
 gem 'dfc_provider', path: './engines/dfc_provider'
@@ -98,7 +98,7 @@ gem 'whenever', require: false
 gem 'test-unit', '~> 3.4'
 
 gem 'coffee-rails', '~> 5.0.0'
-gem 'compass-rails'
+gem 'compass-rails', '~> 3.0'
 
 gem 'mini_racer', '0.4.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 3fbec13ee3..021d98cb91 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,6 +4,16 @@ GIT
   specs:
     custom_error_message (1.1.1)
 
+GIT
+  remote: https://github.com/openfoodfoundation/db2fog.git
+  revision: 5b63343847452f52aa42f7fc169d6ab3af57cda3
+  branch: rails-6
+  specs:
+    db2fog (0.9.2)
+      activerecord (>= 3.2.0, < 7.0)
+      fog-core (~> 1.0)
+      rails (>= 3.2.0, < 7.0)
+
 GIT
   remote: https://github.com/openfoodfoundation/ofn-qz.git
   revision: 467f6ea1c44529c7c91cac4c8211bbd863588c0b
@@ -170,12 +180,22 @@ GEM
     coffee-script-source (1.12.2)
     combine_pdf (1.0.21)
       ruby-rc4 (>= 0.1.5)
-    compass (0.12.2)
+    compass (1.0.3)
       chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.1)
-    compass-rails (2.0.0)
-      compass (>= 0.12.2)
+      compass-core (~> 1.0.2)
+      compass-import-once (~> 1.0.5)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      sass (>= 3.3.13, < 3.5)
+    compass-core (1.0.3)
+      multi_json (~> 1.0)
+      sass (>= 3.3.0, < 3.5)
+    compass-import-once (1.0.5)
+      sass (>= 3.2, < 3.5)
+    compass-rails (3.1.0)
+      compass (~> 1.0.0)
+      sass-rails (< 5.1)
+      sprockets (< 4.0)
     concurrent-ruby (1.1.8)
     connection_pool (2.2.5)
     crack (0.4.5)
@@ -245,16 +265,15 @@ GEM
       flipper (~> 0.20.4)
       rack (>= 1.4, < 3)
       rack-protection (>= 1.5.3, < 2.2.0)
-    fog-aws (3.10.0)
-      fog-core (~> 2.1)
-      fog-json (~> 1.1)
+    fog-aws (2.0.1)
+      fog-core (~> 1.38)
+      fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-core (2.2.4)
+    fog-core (1.45.0)
       builder
-      excon (~> 0.71)
+      excon (~> 0.58)
       formatador (~> 0.2)
-      mime-types
     fog-json (1.2.0)
       fog-core
       multi_json (~> 1.10)
@@ -271,7 +290,6 @@ GEM
     fugit (1.4.5)
       et-orbi (~> 1.1, >= 1.1.8)
       raabro (~> 1.4)
-    fssm (0.2.10)
     fuubar (2.5.1)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
@@ -535,7 +553,7 @@ GEM
     rufus-scheduler (3.7.0)
       fugit (~> 1.1, >= 1.1.6)
     sass (3.4.25)
-    sass-rails (5.1.0)
+    sass-rails (5.0.8)
       railties (>= 5.2.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
@@ -667,11 +685,12 @@ DEPENDENCIES
   codecov
   coffee-rails (~> 5.0.0)
   combine_pdf
-  compass-rails
+  compass-rails (~> 3.0)
   custom_error_message!
   daemons
   dalli
   database_cleaner
+  db2fog!
   ddtrace
   debugger-linecache
   delayed_job_active_record
@@ -685,7 +704,7 @@ DEPENDENCIES
   flipper
   flipper-active_record
   flipper-ui
-  fog-aws (>= 0.6.0)
+  fog-aws (~> 2.0)
   foundation-icons-sass-rails
   foundation-rails (= 5.5.2.1)
   fuubar (~> 2.5.1)
@@ -740,8 +759,8 @@ DEPENDENCIES
   rubocop
   rubocop-rails
   sass (~> 3.4.0)
-  sass-rails (< 6.0.0)
-  select2-rails (~> 3.5.11)
+  sass-rails (< 5.1.0)
+  select2-rails (~> 3.4.7)
   selenium-webdriver
   shoulda-matchers
   sidekiq