diff --git a/.gitignore b/.gitignore
index 2a36ff344a896ce837665d3a80cef16371701c9e..c054381b040541dcc9ffd85f099bdb3cd7248f2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+env/.jekyll-cache/
 *.aux
 *.log
 *.out
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index be09107420b636700d4fcc3de3e1aa2455713a71..6a826c92fc5e236f05d08abea01c50cb3d773eb7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,5 @@
-image: ruby:2.5
+# In case something goes horribly wrong, you can fall back to `image: ruby:2.5`
+image: git-r3lab.uni.lu:4567/r3/docker/jekyll-lcsb:1.0
 
 variables:
   JEKYLL_ENV: production
@@ -6,7 +7,7 @@ variables:
 before_script:
   - apt-get -qq update
   - apt-get install -y -qq git-lfs
-  - bundle install && bundle update
+  - gem install bundler:2.0.2 && bundle install
 
 pages:
   stage: deploy
diff --git a/Gemfile b/Gemfile
index 8cfee77d5a4d4fd4cc46305cab7bfeab4a37cbb2..05a3baca698ddfc4da66824074abdc51f19974d0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,15 +7,12 @@ source "https://rubygems.org"
 #
 #     bundle exec jekyll serve
 #
-# This will help ensure the proper Jekyll version is running.
-# Happy Jekylling!
-gem "jekyll", "~> 3.8.5"
-gem "bundler", "> 1.16.1"
 
-# This is the default theme for new Jekyll sites. You may change this to anything you like.
+gem "jekyll", "~> 4.0"
+gem "bundler", "> 2.0"
+
 gem "minima", "~> 2.5"
-gem 'jekyll-theme-primer', '~> 0.5.3'
-gem 'jekyll-theme-lcsb-default', '~> 0.2.23', :git => "https://git-r3lab.uni.lu/core-services/jekyll-theme-lcsb-default.git", :branch => "master"
+gem 'jekyll-theme-lcsb-default', '~> 0.3'
 
 # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
 # uncomment the line below. To upgrade, run `bundle update github-pages`.
@@ -23,9 +20,18 @@ gem 'jekyll-theme-lcsb-default', '~> 0.2.23', :git => "https://git-r3lab.uni.lu/
 
 # If you have any plugins, put them here!
 group :jekyll_plugins do
- gem "jekyll-paginate-v2", "~> 1.7"
- gem "jekyll-feed", "~> 0.6"
- gem "jekyll-email-protect"
+ gem "jekyll-paginate-v2",
+     "~> 2",
+     :git => "https://github.com/sverrirs/jekyll-paginate-v2.git"
+
+ gem "jekyll-feed",
+     "~> 0.6"
+
+ gem 'jekyll-theme-lcsb-frozen-components',
+     '~> 0.0.1',
+     :git => "https://git-r3lab.uni.lu/core-services/jekyll-theme-lcsb-frozen-components.git",
+     :branch => "master"
+
 end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
@@ -33,3 +39,4 @@ gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 # Performance-booster for watching directories on Windows
 gem "wdm", "~> 0.1.1" if Gem.win_platform?
+
diff --git a/_config.yml b/_config.yml
index 5b8b3570064230e546639e0485dfd916d7642928..45c71ac8a027d4dcf0b7b8edc14a4b9b24ef9180 100644
--- a/_config.yml
+++ b/_config.yml
@@ -54,6 +54,7 @@ theme: jekyll-theme-lcsb-default
 plugins:
   - jekyll-feed
   - jekyll-paginate-v2
+  - jekyll-theme-lcsb-frozen-components
 
 # These settings are used to display share link to howto.lcsb.uni.lu
 # The display logic itself is in the template