diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a75fa300913f12fbaf56d1f6a7bf994253fae173..c705af8c54c7e4713289e42e72764353a79a34e4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,12 +28,14 @@ stages:
 .common_production: &production_before_script
   before_script:
     - gem install bundler --no-document
-    - bundle install --jobs $(nproc) --without test "${FLAGS[@]}"
+    - bundle config set without 'test'
+    - bundle install --jobs $(nproc)
   <<: *cache_production
 
 .common_latest: &latest_before_script
   before_script:
     - "[[ -f \"Gemfile.lock\" ]] && rm Gemfile.lock"
+    - bundle config set without 'test'
     - bundle install --jobs $(nproc) --without test "${FLAGS[@]}"
     - bundle update --jobs $(nproc) "${FLAGS[@]}"
   <<: *cache_latest
@@ -74,9 +76,6 @@ stages:
   stage: test
   variables:
     <<: *common_variables
-    HTMLPROOFER_VERSION: 3.13.0
-    YAMLLINT_VERSION: 0.0.7
-    GIT_STRATEGY: none
   before_script:
     # Installing, generating and exporting locale because htmlproofer needs it.
     # Locale is not set in "standard" docker containers.
@@ -88,15 +87,15 @@ stages:
       export LANG=en_US.UTF-8 && \
       export LANGUAGE=en_US:en && \
       export LC_ALL=en_US.UTF-8"
-    - gem install html-proofer -v $HTMLPROOFER_VERSION --no-document
-    - gem install yaml-lint -v $YAMLLINT_VERSION --no-document
+    - gem install bundler --no-document
+    - bundle install --jobs $(nproc)
   script:
-    - "htmlproofer \
+    - "bundle exec htmlproofer \
         --internal-domains localhost:4000 \
         --disable-external \
         --assume-extension public/"
     # Use yaml-lint tool to check yaml files.
-    - "yaml-lint _data/ _config.yml"
+    - "bundle exec yaml-lint _data/ _config.yml"
   <<: *cache_production
   # https://docs.gitlab.com/ce/ci/yaml/#interruptible
   interruptible: true
@@ -159,8 +158,9 @@ test:htmlproofer:external_links:
     - build:production
   needs: ["build:production"]
   script:
-    - "htmlproofer \
+    - "bundle exec htmlproofer \
         --internal-domains localhost:4000 \
+        --url-ignore 'https://www.openstoragenetwork.org/'
         --assume-extension public/"
   rules:
     - if: '$CI_PIPELINE_SOURCE == "schedule"'
diff --git a/Gemfile b/Gemfile
index e1e9d9fcef9f56a9b80984636069ab06cc2b3e9b..6c00599117ac9f756366c118094e978988aa4abc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,14 +2,14 @@
 source 'https://rubygems.org'
 
 # List of required gems
-gem 'jekyll', '~> 4.1.1'
+gem 'jekyll', '~> 4.2.0'
 gem 'jekyll-paginate', '~> 1.1.0'
-gem 'rouge', '~> 3.25.0'
+gem 'rouge', '~> 3.26.0'
 gem 'jekyll-redirect-from', '~> 0.16.0'
 gem 'jekyll-feed', '~> 0.15.1'
 gem "jekyll-sitemap", "~> 1.4"
 
 group :test do
-    gem 'html-proofer', '~> 3.17.3'
+    gem 'html-proofer', '~> 3.18.5'
     gem 'yaml-lint', '~>0.0.7'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index e40cec84fbd8bba192bc1414f4eee7bfb55b2c21..a3cdb9f5e341e4e95bdf88d5e317c57e02864fc6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -11,9 +11,9 @@ GEM
     ethon (0.12.0)
       ffi (>= 1.3.0)
     eventmachine (1.2.7)
-    ffi (1.13.1)
+    ffi (1.14.2)
     forwardable-extended (2.6.0)
-    html-proofer (3.17.3)
+    html-proofer (3.18.5)
       addressable (~> 2.3)
       mercenary (~> 0.3)
       nokogumbo (~> 2.0)
@@ -24,21 +24,21 @@ GEM
     http_parser.rb (0.6.0)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    jekyll (4.1.1)
+    jekyll (4.2.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
       jekyll-sass-converter (~> 2.0)
       jekyll-watch (~> 2.0)
-      kramdown (~> 2.1)
+      kramdown (~> 2.3)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
       mercenary (~> 0.4.0)
       pathutil (~> 0.9)
       rouge (~> 3.0)
       safe_yaml (~> 1.0)
-      terminal-table (~> 1.8)
+      terminal-table (~> 2.0)
     jekyll-feed (0.15.1)
       jekyll (>= 3.7, < 5.0)
     jekyll-paginate (1.1.0)
@@ -55,7 +55,7 @@ GEM
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
     liquid (4.0.3)
-    listen (3.2.1)
+    listen (3.3.3)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
@@ -73,11 +73,11 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rexml (3.2.4)
-    rouge (3.25.0)
+    rouge (3.26.0)
     safe_yaml (1.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
-    terminal-table (1.8.0)
+    terminal-table (2.0.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     typhoeus (1.4.0)
       ethon (>= 0.9.0)
@@ -89,13 +89,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  html-proofer (~> 3.17.3)
-  jekyll (~> 4.1.1)
+  html-proofer (~> 3.18.5)
+  jekyll (~> 4.2.0)
   jekyll-feed (~> 0.15.1)
   jekyll-paginate (~> 1.1.0)
   jekyll-redirect-from (~> 0.16.0)
   jekyll-sitemap (~> 1.4)
-  rouge (~> 3.25.0)
+  rouge (~> 3.26.0)
   yaml-lint (~> 0.0.7)
 
 BUNDLED WITH
diff --git a/_data/hifis_team.yml b/_data/hifis_team.yml
index 7e08ec2f59b2a1e8e6ec79f52ea3d85d511f13ac..7eb8facdb301cd78dd5e4e2649f9b9bd1568700f 100644
--- a/_data/hifis_team.yml
+++ b/_data/hifis_team.yml
@@ -43,6 +43,7 @@
   cluster: overall
 - id: finke
   name: "Finke, Ants"
+  image: "Ants_Finke.jpg"
   location:
     campus: hzb
   position: "Coordinator"
@@ -82,6 +83,7 @@
   cluster: backbone
 - id: klotz
   name: "Klotz, Andreas"
+  image: "Andreas_Klotz.jpg"
   location:
     campus: hzb
   position: "Cloud Cluster Management"
diff --git a/_posts/2020/12/2020-12-17-eosc-general-assembly.md b/_posts/2020/12/2020-12-17-eosc-general-assembly.md
new file mode 100644
index 0000000000000000000000000000000000000000..791074ec6fad1cb1c2811f2d4b0b8db21dfcc68d
--- /dev/null
+++ b/_posts/2020/12/2020-12-17-eosc-general-assembly.md
@@ -0,0 +1,43 @@
+---
+title: "Constituting General Assembly of EOSC Association"
+title_image: spacex-uj3hvdfQujI-unsplash.jpg
+data: 2020-12-17
+authors:
+  - jandt
+layout: blogpost
+categories:
+  - news
+excerpt: >
+    In the constituting General Assembly of the EOSC association, the first President and Directors have been elected.
+
+---
+
+# EOSC Association General Assembly
+
+In the [constituting General Assembly](https://www.eosc-portal.eu/news/eosc-association-general-assembly-take-place-tomorrow) of the EOSC association, the first President and Directors have been elected.
+
+## President
+
+**Karel Luyben** (TU Delft) has been elected as president with 119 out of 139 votes.
+
+
+## Board of Directors
+
+The Board of Directors consists of the following eight members:
+
+#### For 3 year period
+
+- Marialuisa Lavitrano (UNIMIB), Italy
+- Suzanne Demouchel (CNRS), France
+- Klaus Tochtermann (ZBW), Germany
+
+#### For 2 year period
+
+- Sarah Jones (GÉANT)
+- Ignacio Blanquer (UPV), Spain
+
+#### For 1 year period
+
+- Wilhelm Widmark (SU), Sweden
+- Bob Jones (CERN)
+- Ronan Byrne (HEAnet), Ireland
diff --git a/_roadmap/backbone/2020-08-01.md b/_roadmap/backbone/2020-08-01-aai.md
similarity index 100%
rename from _roadmap/backbone/2020-08-01.md
rename to _roadmap/backbone/2020-08-01-aai.md
diff --git a/_roadmap/backbone/2020-09-01.md b/_roadmap/backbone/2020-09-01-agreement.md
similarity index 100%
rename from _roadmap/backbone/2020-09-01.md
rename to _roadmap/backbone/2020-09-01-agreement.md
diff --git a/_roadmap/backbone/2021-01-01.md b/_roadmap/backbone/2021-01-01-backbone.md
similarity index 100%
rename from _roadmap/backbone/2021-01-01.md
rename to _roadmap/backbone/2021-01-01-backbone.md
diff --git a/_roadmap/cloud/2020-05-01.md b/_roadmap/cloud/2020-05-01-service-selection.md
similarity index 100%
rename from _roadmap/cloud/2020-05-01.md
rename to _roadmap/cloud/2020-05-01-service-selection.md
diff --git a/_roadmap/cloud/2020-10-01.md b/_roadmap/cloud/2020-10-01-announce-portfolio.md
similarity index 100%
rename from _roadmap/cloud/2020-10-01.md
rename to _roadmap/cloud/2020-10-01-announce-portfolio.md
diff --git a/_roadmap/cloud/2020-10-15.md b/_roadmap/cloud/2020-10-15-integration-kickoff.md
similarity index 100%
rename from _roadmap/cloud/2020-10-15.md
rename to _roadmap/cloud/2020-10-15-integration-kickoff.md
diff --git a/_roadmap/cloud/2021-01-01.md b/_roadmap/cloud/2021-01-01.md
new file mode 100644
index 0000000000000000000000000000000000000000..536bc8c3995025ee6255a90fb9e998894438812d
--- /dev/null
+++ b/_roadmap/cloud/2021-01-01.md
@@ -0,0 +1,10 @@
+---
+date: 2021-01-01
+title: Tasks in Jan 2021
+service: cloud
+---
+
+## Top 10 of future Helmholtz Cloud Services 
+We are happy to announce that the group of the 10 most mature services has reached a maturity level of more than 80% - more than sufficient for them to be integrated into the Cloud Portal in the coming weeks. This top group includes services like **GitLab** (HZDR, FZJ), **Nextcloud** (HZB, KIT), **Mattermost** (HZDR), **Rocket.Chat** (FZJ) but also **OpenStack** (FZJ, KIT), **JupyterHub** (FZJ), **Zammad** (HZDR) and **B2Share** (FZJ).
+
+Find more information of Initial Service Portfolio [here](https://hifis.net/news/2020/10/13/initial-service-portfolio.html).
diff --git a/_roadmap/cloud/2021-02-01.md b/_roadmap/cloud/2021-02-01.md
new file mode 100644
index 0000000000000000000000000000000000000000..baf7d1a5dd705d8b1bf3a7b621be79c46d59b4ac
--- /dev/null
+++ b/_roadmap/cloud/2021-02-01.md
@@ -0,0 +1,11 @@
+---
+date: 2021-02-01
+title: Tasks in Feb 2021
+service: cloud
+---
+
+## Beta Version of Helmholtz Cloud Portal online
+The Helmholtz Cloud Portal allows harmonized access to all Helmholtz Cloud services. It contains all necessary information to access the available services. The alpha version of the portal is planned to be available by end 2020 and the publicly accessible beta version is planned for February 2021.
+
+
+
diff --git a/_roadmap/cloud/2021-04-01.md b/_roadmap/cloud/2021-04-01-service-evaluation.md
similarity index 100%
rename from _roadmap/cloud/2021-04-01.md
rename to _roadmap/cloud/2021-04-01-service-evaluation.md
diff --git a/_roadmap/cloud/2021-12-01.md b/_roadmap/cloud/2021-12-01-process-manual.md
similarity index 100%
rename from _roadmap/cloud/2021-12-01.md
rename to _roadmap/cloud/2021-12-01-process-manual.md
diff --git a/_roadmap/cloud/2022-01-01.md b/_roadmap/cloud/2022-01-01-review-cloud-portfolio.md
similarity index 100%
rename from _roadmap/cloud/2022-01-01.md
rename to _roadmap/cloud/2022-01-01-review-cloud-portfolio.md
diff --git a/_roadmap/overall/2020-09-01.md b/_roadmap/overall/2020-09-01-helpdesk.md
similarity index 100%
rename from _roadmap/overall/2020-09-01.md
rename to _roadmap/overall/2020-09-01-helpdesk.md
diff --git a/assets/img/members/Andreas_Klotz.jpg b/assets/img/members/Andreas_Klotz.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..578d420e4c5bbca6482c834382810e8340e43b66
Binary files /dev/null and b/assets/img/members/Andreas_Klotz.jpg differ
diff --git a/assets/img/members/Ants_Finke.jpg b/assets/img/members/Ants_Finke.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0bcd07645a9a318e413ffd0f5fdda79ff3e87b63
Binary files /dev/null and b/assets/img/members/Ants_Finke.jpg differ
diff --git a/job_offers.md b/job_offers.md
index d76c2022a8c15fc11b98189fcd9aac0c5152bec1..b38740ca49195284f64f0191e33d0d7e0adaa84e 100644
--- a/job_offers.md
+++ b/job_offers.md
@@ -8,7 +8,9 @@ excerpt:
 
 # Job Offers related to HIFIS
 {:.text-success}
-
+* DESY Hamburg:   
+  [**Scientist, to lead the implementation of a Helmholtz-wide Service Marketplace.**](https://www.desy.de/career/job_offers/index_eng.html?joboffer=93233)  
+  Application deadline: Jan 04, 2021. 
 
 # Further offers