diff --git a/docs/guides/.infrastructure/index.html.j2 b/docs/guides/.infrastructure/index.html.j2
index 15a18ed28b0..3068fdc7b84 100644
--- a/docs/guides/.infrastructure/index.html.j2
+++ b/docs/guides/.infrastructure/index.html.j2
@@ -134,27 +134,31 @@
           You can subscribe via Google Groups (linked above) or simply by sending a mail to
           <em>[list]+subscribe@opencast.org</em> (e.g. <em>users+subscribe@opencast.org</em>).
         </div>
-        <div class="col-md-6">
-          <h4>Matrix room (Chat)</h4>
-          <p>For occasional quick questions join us in Matrix:
-          <a href="https://matrix.to/#/#opencast-community:matrix.org"><em>#opencast-community:matrix.org</em></a>.</p>
-        </div>
+
         <div class="col-md-6">
           <h4>Meetings</h4>
-          <p>Our meeting calendar can be found <a href="https://calendar.google.com/calendar/ical/opencast.org_tje2fm34ernnbm0f9saiogp8g0%40group.calendar.google.com/public/basic.ics">here</a>, and consists mainly of two meetings
-        <div class="col-md-6">
-          <h5>Dev meeting</h5>
-          <p>Our weekly open meeting of developers and dev-ops takes place at
-          <a href="https://opencast.blindsidenetworks.net">meet.opencast.video</a> (room 1, p: welcome), check the calendar link above for dates and times.
+
+          <p>You can find an overview of all meetings and events in our
+          <a href="https://calendar.google.com/calendar/u/0/embed?src=opencast.org_tje2fm34ernnbm0f9saiogp8g0@group.calendar.google.com&ctz=Europe/Amsterdam&pli=1">community calender</a>.
+
+          <h5>Technical meeting</h5>
+          <p>Weekly open meeting of developers and dev-ops at
+          <a href="https://opencast.blindsidenetworks.net">meet.opencast.video</a> (room 1, p: welcome), check the calendar link for dates and times.
           This is where you want to be to talk technical Opencast issues with developers.</p>
-        </div>
-        <div class="col-md-6">
+
           <h5>SysAdmin meeting</h5>
           <p>Monthly adopters and sys-admins meeting at
-          <a href="https://opencast.blindsidenetworks.net">meet.opencast.video</a> (room 1, p: welcome), check the calendar link above for dates and times.
+          <a href="https://opencast.blindsidenetworks.net">meet.opencast.video</a> (room 1, p: welcome), check the calendar link for dates and times.
           The goal of this meeting is to talk about current challenges, as well as upcoming development and testing coordination.  If you run Opencast, or are thinking about doing so, this is the meeting to attend.</p>
         </div>
       </div>
+      <div class="row">
+        <div class="col-md-6">
+          <h4>Matrix room (Chat)</h4>
+          <p>For occasional quick questions join us in Matrix:
+          <a href="https://matrix.to/#/#opencast-community:matrix.org"><em>#opencast-community:matrix.org</em></a>.</p>
+        </div>
+      </div>
 
       <hr>