diff --git a/_data/navigation.yml b/_data/navigation.yml
index 085ef0eda260364a1c18d31a3936e26cf8c8f4ac..1188f38325a82e19e4171e219dea494832c6fd60 100644
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -21,7 +21,7 @@ header:
url: "mission/"
- title: Roadmap
- url: "/"
+ url: "roadmap/"
- title: International
url: "/"
diff --git a/_layouts/frontpage.html b/_layouts/frontpage.html
index 94869628b9a92a93a82f6d03f846faf2505f6314..05f35cde9660c39afd827e042676b363e4179697 100644
--- a/_layouts/frontpage.html
+++ b/_layouts/frontpage.html
@@ -57,11 +57,11 @@
labore et dolore magna aliqua.</p>
</div>
<div class="info-box">
- <a href="{% link index.md %}" class="btn btn-outline-light">
+ <a href="{% link roadmap/index.md %}" class="btn btn-outline-light">
<h3><i class="fas fa-road" aria-hidden="true"></i> Now & tomorrow - The HIFIS Roadmap</h3>
</a>
- <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut
- labore et dolore magna aliqua.</p>
+ <p>Get the latest updates of the HIFIS roadmap, summarizing our goals for the months and years to come.
+</p>
</div>
</div>
</section>
diff --git a/_layouts/roadmap.html b/_layouts/roadmap.html
new file mode 100644
index 0000000000000000000000000000000000000000..dbf3e3bb282d74f3bee887004ac9054fdff69487
--- /dev/null
+++ b/_layouts/roadmap.html
@@ -0,0 +1,58 @@
+{% include top.html %}
+
+<body>
+
+ {% include header.html %}
+
+ <main>
+ {% include title_image.html%}
+
+ {% assign sorted_roadmap = site.roadmap | sort: "date" %}
+ {% assign service_names = "Backbone Services,Cloud Services,Software Services,HIFIS Overall" | split: "," %}
+ {% assign unique_dates = sorted_roadmap | map: "date" | uniq | sort %}
+
+ {% assign year = "1999" %}
+ {% assign did_first_section = false %}
+
+ <section>
+ <div class="timeline">
+ {% for date_item in unique_dates %}
+ {% assign sorted_roadmap_by_date = sorted_roadmap | where_exp: "roadmap", "roadmap.date == date_item" %}
+ {% assign newyear = date_item | date: "%Y" %}
+
+ {% if newyear != year %}
+ {% assign year = newyear %}
+ <div class="roadmap-year">{{ newyear }}</div>
+ {% endif %}
+
+ <div class="roadmap-month">
+ <div class="timeline-bubble"></div>
+ <div class="month-text">{{ date_item | date: "%B %Y" }}</div>
+ </div>
+ <div class="roadmap-item">
+
+
+ {% for roadmap_item in sorted_roadmap_by_date %}
+ {% assign service_short = roadmap_item.service | capitalize %}
+ <article>
+ {% for service_name in service_names %}
+ {% if service_name contains service_short %}
+ <div class="service_name">{{ service_name }}</div>
+ {% endif %}
+ {% endfor %}
+ <p>{{ roadmap_item.content | markdownify }}</p>
+ </article>
+ {% endfor %}
+
+ </div>
+
+ {% endfor %}
+ </div>
+ </section>
+ </main>
+
+ {% include footer.html %}
+
+</body>
+
+</html>
diff --git a/_roadmap/communities/.gitkeep b/_roadmap/backbone/.gitkeep
similarity index 100%
rename from _roadmap/communities/.gitkeep
rename to _roadmap/backbone/.gitkeep
diff --git a/_roadmap/backbone/2020-08-01.md b/_roadmap/backbone/2020-08-01.md
new file mode 100644
index 0000000000000000000000000000000000000000..10b954fe4ffa39585aff5d7539a46da75ef8db64
--- /dev/null
+++ b/_roadmap/backbone/2020-08-01.md
@@ -0,0 +1,9 @@
+---
+date: 2020-08-01
+title: Tasks in August 2020
+service: backbone
+---
+
+## Start of Helmholtz AAI
+The blueprint for the new official Helmholtz-wide Authentication and Authorization Infrastructure (Helmholtz AAI), derived from former [HDF AAI](http://cvs.data.kit.edu/hdf-aai/), is online and available for services and identity providers. It is drafted by [FZJ](https://fz-juelich.de) and [KIT](https://www.kit.edu/), and is compatible to the [AARC blueprint](https://aarc-project.eu/architecture/).
+
diff --git a/_roadmap/backbone/2020-09-01.md b/_roadmap/backbone/2020-09-01.md
new file mode 100644
index 0000000000000000000000000000000000000000..52b0003fc55ecdf25e8bc621c8e0965005c16765
--- /dev/null
+++ b/_roadmap/backbone/2020-09-01.md
@@ -0,0 +1,8 @@
+---
+date: 2020-09-01
+title: Tasks in September 2020
+service: backbone
+---
+
+## Service Agreement on Helmholtz Backbone
+HIFIS fostered a service agreement with the German National Research and Education Network (DFN) on operating a a Helmholtz-wide Virtual Private Network (Helmholtz Backbone), covering the majority of Helmholtz centres. By September, the contract is expected to be signed from the participating partners.
diff --git a/_roadmap/backbone/2021-01-01.md b/_roadmap/backbone/2021-01-01.md
new file mode 100644
index 0000000000000000000000000000000000000000..bbd1910f266fe39e4837132c28e27721e6480da3
--- /dev/null
+++ b/_roadmap/backbone/2021-01-01.md
@@ -0,0 +1,8 @@
+---
+date: 2021-01-01
+title: Tasks in January 2021
+service: backbone
+---
+
+## Set-up of Helmholtz Backbone Connections
+First Virtual Private Network (Helmholtz Backbone) connections have been set up and are in productive use.
diff --git a/_roadmap/consulting/.gitkeep b/_roadmap/cloud/.gitkeep
similarity index 100%
rename from _roadmap/consulting/.gitkeep
rename to _roadmap/cloud/.gitkeep
diff --git a/_roadmap/cloud/2020-10-01.md b/_roadmap/cloud/2020-10-01.md
new file mode 100644
index 0000000000000000000000000000000000000000..af72bb28c2da115f9c09427a3add3f8feccb9570
--- /dev/null
+++ b/_roadmap/cloud/2020-10-01.md
@@ -0,0 +1,10 @@
+---
+date: 2020-10-01
+title: Tasks in October 2020
+service: cloud
+---
+
+## Announce initial Helmholtz Cloud Service Portfolio
+After multiple rounds, the first set of selected federated services, forming the initial Helmholtz
+Cloud Service Portfolio, will be announced and started to be integrated. This set will be continuously enhanced
+and the performance of the integrated services will be monitored.
diff --git a/_roadmap/education/2020-03-01-Tasks-in-March-2020.md b/_roadmap/education/2020-03-01-Tasks-in-March-2020.md
deleted file mode 100644
index 470f645434a2705ec55ad22f7af63e4b91a4d64a..0000000000000000000000000000000000000000
--- a/_roadmap/education/2020-03-01-Tasks-in-March-2020.md
+++ /dev/null
@@ -1,15 +0,0 @@
----
-date: 2020-03-01
-title: Tasks in March 2020
-service: education
----
-
-## Train Software Carpentry Instructors
-
-Several HIFIS-members will complete their Software Carpentry Instructor Training
-to offer you an even better workshop experience.
-
-## SWC Workshop at the HZDR
-
-We will hold a Software Carpentry Workshop on March 31st.
-
diff --git a/_roadmap/education/.gitkeep b/_roadmap/overall/.gitkeep
similarity index 100%
rename from _roadmap/education/.gitkeep
rename to _roadmap/overall/.gitkeep
diff --git a/_roadmap/overall/2021-03-01-Tasks-in-March-2021.md b/_roadmap/overall/2021-03-01-Tasks-in-March-2021.md
new file mode 100644
index 0000000000000000000000000000000000000000..5d304c8cba4704cde8e1777f823207544c265cf2
--- /dev/null
+++ b/_roadmap/overall/2021-03-01-Tasks-in-March-2021.md
@@ -0,0 +1,11 @@
+---
+date: 2021-03-01
+title: Tasks in March 2021
+service: overall
+---
+
+## Finish reporting for the first two years of HIFIS
+
+After the ramp-up phase during the first year, the initial Cloud, Backbone and Software Services are
+expected to be in production by early 2021. We will report on the integration progress and impact of these
+services, especially with respect to user acceptance and added value for the scientific community.
diff --git a/_roadmap/technology/.gitkeep b/_roadmap/software/.gitkeep
similarity index 100%
rename from _roadmap/technology/.gitkeep
rename to _roadmap/software/.gitkeep
diff --git a/_roadmap/technology/2020-07-01-tasks.md b/_roadmap/software/2020-07-01-tasks.md
similarity index 81%
rename from _roadmap/technology/2020-07-01-tasks.md
rename to _roadmap/software/2020-07-01-tasks.md
index 75437669a98dd9034597d11e3b41325ac560343a..0aa0e375c546c262e4f0027b3de992a776e0b77c 100644
--- a/_roadmap/technology/2020-07-01-tasks.md
+++ b/_roadmap/software/2020-07-01-tasks.md
@@ -1,7 +1,7 @@
---
-date: 2020-07-01
-title: Tasks in July 2020
-service: technology
+date: 2020-08-01
+title: Tasks in August 2020
+service: software
---
## Recipes for a Scalable CI solution
diff --git a/_roadmap/technology/2020-10-01-tasks.md b/_roadmap/software/2020-10-01-tasks.md
similarity index 94%
rename from _roadmap/technology/2020-10-01-tasks.md
rename to _roadmap/software/2020-10-01-tasks.md
index b192372c02448a07471c8fd3cddc666bf4292b65..82afb574155ac64892ed8320606408ba4f6f2793 100644
--- a/_roadmap/technology/2020-10-01-tasks.md
+++ b/_roadmap/software/2020-10-01-tasks.md
@@ -1,7 +1,7 @@
---
date: 2020-10-01
title: Tasks in October 2020
-service: technology
+service: software
---
## Integrate the Software Management Platform into the Helmholtz Cloud
diff --git a/_roadmap/technology/2020-12-01-tasks.md b/_roadmap/software/2020-12-01-tasks.md
similarity index 96%
rename from _roadmap/technology/2020-12-01-tasks.md
rename to _roadmap/software/2020-12-01-tasks.md
index 7fe0d84ad210e831a8f4581590114f373f06b0ad..0b138cb22c7e1332903fbd1d7e6b4f7308ee065d 100644
--- a/_roadmap/technology/2020-12-01-tasks.md
+++ b/_roadmap/software/2020-12-01-tasks.md
@@ -1,7 +1,7 @@
---
date: 2020-12-01
title: Tasks in December 2020
-service: technology
+service: software
---
## Integrations for the Software Management Platform
diff --git a/_roadmap/technology/2020-03-01-tasks.md b/_roadmap/technology/2020-03-01-tasks.md
deleted file mode 100644
index 52fcb1735fbfcfbe26f3a5e4a44910edf35d3f29..0000000000000000000000000000000000000000
--- a/_roadmap/technology/2020-03-01-tasks.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-date: 2020-03-01
-title: Tasks in March 2020
-service: technology
----
-
-## [Launch of the HIFIS Software Events platform][indico]
-HIFIS Software will provide workshops, training and special events for
-scientists of the whole Helmholtz Association.
-In order to streamline the registration and organization process, we decided
-to provide our own events infrastructure until a Helmholtz Cloud solution is
-available.
-The solution is based on [Indico](https://getindico.io).
-The HIFIS Software events platform is available via:
-[https://hifis-events.hzdr.de](https://hifis-events.hzdr.de)
-
-[indico]: https://hifis-events.hzdr.de
diff --git a/_roadmap/technology/2020-05-01-tasks.md b/_roadmap/technology/2020-05-01-tasks.md
deleted file mode 100644
index f186bad74b2095992c078f9e0c6919a1d538c83b..0000000000000000000000000000000000000000
--- a/_roadmap/technology/2020-05-01-tasks.md
+++ /dev/null
@@ -1,12 +0,0 @@
----
-date: 2020-05-01
-title: Tasks in May 2020
-service: technology
----
-
-## [Launch of the HIFIS Software Helpdesk][helpdesk]
-In order to streamline the process of user requests and workshop organisation
-in our distributed team a helpdesk will be launched. The solution will be
-based on [Zammad](https://zammad.org/).
-
-[helpdesk]: https://hifis-help.hzdr.de
diff --git a/_roadmap/technology/2020-06-01-tasks.md b/_roadmap/technology/2020-06-01-tasks.md
deleted file mode 100644
index a2107c1fb9f5a7b83da2820df21092ef7204de8a..0000000000000000000000000000000000000000
--- a/_roadmap/technology/2020-06-01-tasks.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-date: 2020-06-01
-title: Tasks in June 2020
-service: technology
----
-
-## Finish the Analysis of the HIFIS Software Survey
-In early 2020 a Helmholtz-wide survey targeting at Helmholtz scientists was
-conducted in order to analyze the status quo of research software development
-in Helmholtz and to tailor the offers of HIFIS Software to the requirements of
-the scientists.
-
-## Dedicated Technology Pages
-It is planned to provide a first iteration of dedicated technology pages on
-[https://software.hifis.net](https://software.hifis.net).
-We will
-- detail the offers available by the Technology services team of HIFIS
- Software,
-- provide an overview of available platforms and tools and
-- evaluate the listed platforms and tools.
-
-## Recipes for a Scalable GitLab Instance
-The main task of the Technology team is to provide a well-integrated software
-management infrastructure for all Helmholtz centers and beyond.
-The central component will be a [GitLab](https://about.gitlab.com/) instance.
-The recipes will be implemented using the configuration management tool
-[Ansible](https://www.ansible.com/).
-This way the recipes can be provided for all Helmholtz centers to reduce the
-individual administration effort.
-
-## GitLab Integration for Invenio / Rodare
-Enhancing [Invenio](https://inveniosoftware.org/) and
-[Rodare](https://rodare.hzdr.de/) with a GitLab integration.
diff --git a/roadmap/.gitkeep b/roadmap/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/roadmap/index.md b/roadmap/index.md
new file mode 100644
index 0000000000000000000000000000000000000000..c393479904ca750ab18cdcdd2442efdec53e9a17
--- /dev/null
+++ b/roadmap/index.md
@@ -0,0 +1,12 @@
+---
+title: Roadmap
+layout: roadmap
+excerpt:
+ "The is the roadmap of the HIFIS platform.
+ It summarises the goals for the next months and years."
+---
+{% comment %}
+ This markdown file triggers the generation of the roadmap page.
+ Only the frontmatter is required by Jekyll.
+ The contents section does not get rendered into HTML on purpose.
+{% endcomment %}