diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d01faedf48c8a5c77d5aeb3940605bd1c2df80c1..0b604e4e48c241bc8964acb6133cf6f8b1c9fb49 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,6 +43,7 @@ stages:
     - "[[ -x \"$(command -v apt-get)\" ]] && \
           apt-get update && \
           apt-get install -y ffmpeg"
+    - ./fetch_external_content.sh
     - "[[ -f \"Gemfile.lock\" ]] && rm Gemfile.lock"
     - bundle config set without 'test'
     - bundle install --jobs $(nproc) --without test "${FLAGS[@]}"
diff --git a/_sass/common/_table.scss b/_sass/common/_table.scss
new file mode 100644
index 0000000000000000000000000000000000000000..a5397c1855c6b3933fb630cc6cbd0222b9a7bf9a
--- /dev/null
+++ b/_sass/common/_table.scss
@@ -0,0 +1,26 @@
+
+table{
+    margin: 1 rem;
+    border-collapse: collapse;
+    border: 0.1rem solid $color-helmholtz-blue;
+
+    tr {
+        &:nth-child(even){
+            background-color: rgba($color-helmholtz-bright-blue, 0.125);
+        }
+
+        &:hover {
+            background-color: rgba($color-helmholtz-blue, 0.25);
+        }
+    }
+
+    th {
+        color: $color-content-light-gray;
+        background-color: $color-helmholtz-blue;
+
+    }
+
+    td, th {
+        padding: 0.2rem 0.5rem;
+    }
+}
diff --git a/assets/css/hifis.scss b/assets/css/hifis.scss
index 2551bb6c639c8f19926ea5840c6d09c3dab92818..1abcd7811b68b7dca85f7a4fe8083a72f8eafec1 100644
--- a/assets/css/hifis.scss
+++ b/assets/css/hifis.scss
@@ -50,6 +50,7 @@
 @import "common/jumbotron";
 @import "common/main";
 @import "common/pagination";
+@import "common/table";
 @import "common/title";
 @import "common/transitions";
 
diff --git a/fetch_external_content.sh b/fetch_external_content.sh
index 51a7b925edf384bfec88b6ff452309425e08218d..03e06866615ba48030bc1c9ce733fb9d294f67b8 100755
--- a/fetch_external_content.sh
+++ b/fetch_external_content.sh
@@ -28,6 +28,10 @@ include_mkdocs \
   "https://gitlab.hzdr.de/hifis/software/education/hifis-workshops/workshop-pandas/-/jobs/artifacts/main/download?job=pages" \
   "workshop-materials/python-pandas/"
 
+include_mkdocs \
+  "https://gitlab.hzdr.de/hifis/software/education/hifis-workshops/workshop-matplotlib/-/jobs/artifacts/main/download?job=pages" \
+  "workshop-materials/python-matplotlib/"
+
 # 2. Get HIFIS Intro letter
 # tbd
 
diff --git a/services/overall/learning-materials.md b/services/overall/learning-materials.md
index c091ee9de4235fe86e939d66f90491bb6353565b..18bac7c33b4f526a7314cf4f27d08fc07ff441b5 100644
--- a/services/overall/learning-materials.md
+++ b/services/overall/learning-materials.md
@@ -9,15 +9,39 @@ redirect_from:
     - services/overall/tutorials
     - services/overall/guidelines
     - guidelines
+    - workshop-materials
 excerpt:
   "We provide learning materials for all purposes related to software engineering and cloud services usage."
 ---
 
 {{ page.excerpt }}
 
-## Workshop Material
+## Workshop Materials
 
-- [Course and Workshop material]({{ "workshop-materials" | relative_url }}) is available for use and reuse under a Creative Commons License.
+Our workshop material is available for self-guided learning or as a basis for your own workshops.
+Its use and reuse is permitted under a Creative Commons License (see the footers on the workshop pages).
+
+If you find issues or would like to contribute, feel free to take a look at the respective repositories.
+
+### Python
+
+| Topic                       | Materials                              | Repository                           |
+|-----------------------------|----------------------------------------|--------------------------------------|
+| Object-Oriented Programming | [Material][python-oop-material]        | [Repository][python-oop-repo]        |
+| The _Pandas_ framework      | [Material][python-pandas-material]     | [Repository][python-pandas-repo]     |
+| The _Matplotlib_ framework  | [Material][python-matplotlib-material] | [Repository][python-matplotlib-repo] |
+
+[python-matplotlib-material]: {{ "workshop-materials/python-matplotlib/" | relative_url}}
+[python-matplotlib-repo]: https://gitlab.hzdr.de/hifis/software/education/hifis-workshops/workshop-matplotlib
+[python-oop-material]: {{ "workshop-materials/python-oop/" | relative_url }}
+[python-oop-repo]: https://gitlab.hzdr.de/hifis/software/education/hifis-workshops/workshop-oop-in-python
+[python-pandas-material]: {{ "workshop-materials/python-pandas/" | relative_url }}
+[python-pandas-repo]: https://gitlab.hzdr.de/hifis/software/education/hifis-workshops/workshop-pandas
+
+### Further Materials
+
+Not all of our workshop materials are published in a nice fashion (yet).
+You can find the complete set of materials in the [Helmholtz Codebase](https://gitlab.hzdr.de/hifis/software/education/hifis-workshops).
 
 ## Tutorials
 
diff --git a/workshop-materials/index.md b/workshop-materials/index.md
deleted file mode 100644
index fc2e1597e359cfce6c909f10a3a65611eecfe075..0000000000000000000000000000000000000000
--- a/workshop-materials/index.md
+++ /dev/null
@@ -1,31 +0,0 @@
----
-title: Workshop Materials
-title_image: default
-layout: default
-additional_css:
-    - frontpage.css
-    - title/service-title-buttons.css
-additional_js: frontpage.js
-excerpt:
-    HIFIS Workshop Materials.
----
-
-## Published Workshop Materials
-
-
-### Python
-
-* **OOP in Python:**:
-[**Material**]({{ "workshop-materials/python-oop/" | relative_url }})
-[Repository](https://gitlab.hzdr.de/hifis/software/education/hifis-workshops/workshop-oop-in-python)
-* **Pandas:**
-[**Material**]({{ "workshop-materials/python-pandas/" | relative_url }})
-[Repository](https://gitlab.hzdr.de/hifis/software/education/hifis-workshops/workshop-pandas)
-
-## Further links
-
-More materials will be added soon here.
-See also our gitlab and github repositories for further workshop information.
-
-- <https://gitlab.com/hifis/hifis-workshops>
-- <https://gitlab.hzdr.de/hifis/software/education/hifis-workshops>
diff --git a/workshop-materials/python-matplotlib/.gitkeep b/workshop-materials/python-matplotlib/.gitkeep
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391