diff --git a/develop/admin/index.html b/develop/admin/index.html
index 3b4fadce3..597fb762b 100644
--- a/develop/admin/index.html
+++ b/develop/admin/index.html
@@ -764,5 +764,5 @@ <h2 id="release-documentation">Release Documentation</h2>
 </html>
 <!--
 MkDocs version : 1.6.1
-Build Date UTC : 2024-12-29 15:15:34.524298+00:00
+Build Date UTC : 2024-12-29 16:54:23.484491+00:00
 -->
\ No newline at end of file
diff --git a/develop/commit b/develop/commit
index dcc250ff7..c8ef5e6e7 100644
--- a/develop/commit
+++ b/develop/commit
@@ -1,5 +1,25 @@
-commit 6aa663a0254f84490c40997bc22b0d8de67ed56d
+commit 9df6b01875b43296b605c463b53e94ad15f068ff
 Author: Lars Kiesow <lkiesow@uos.de>
-Date:   Sun Dec 29 16:14:59 2024 +0100
+Date:   Sun Dec 29 17:53:59 2024 +0100
 
-    Merge r/17.x into develop
+    Document GitHub Discussions on Docs Landing Page (#6393)
+    
+    This patch updates the landing page of docs.opencast.org to add GitHub
+    Discussions as new location for discussions and questions about
+    Opencast.
+    
+    ### Your pull request should…
+    
+    * [x] have a concise title
+    * [x] [close an accompanying
+    issue](https://docs.opencast.org/develop/developer/#participate/development-process/#automatically-closing-issues-when-a-pr-is-merged)
+    if one exists
+    * [x] [be against the correct
+    branch](https://docs.opencast.org/develop/developer/development-process#acceptance-criteria-for-patches-in-different-versions)
+    * [x] include migration scripts and documentation, if appropriate
+    * [x] pass automated tests
+    * [x] have a clean commit history
+    * [x] [have proper commit messages (title and body) for all
+    commits](https://medium.com/@steveamaza/e028865e5791)
+    * [x] explain why it needs to be merged into the legacy branch, if it is
+    targeting the legacy branch
diff --git a/develop/developer/index.html b/develop/developer/index.html
index e2dc39f44..a15d333ec 100644
--- a/develop/developer/index.html
+++ b/develop/developer/index.html
@@ -386,5 +386,5 @@ <h1 id="opencast-development-guides">Opencast Development Guides</h1>
 </html>
 <!--
 MkDocs version : 1.6.1
-Build Date UTC : 2024-12-29 15:15:36.270190+00:00
+Build Date UTC : 2024-12-29 16:54:25.227389+00:00
 -->
\ No newline at end of file
diff --git a/index.html b/index.html
index 3436adedb..88c9a459e 100644
--- a/index.html
+++ b/index.html
@@ -401,21 +401,18 @@ <h3>
       </h3>
       <div class="row">
         <div class="col-md-6">
-          <h4>Mailing lists</h4>
-          <p>Discussions take place on several mailing lists:</p>
+          <h4>Discussions</h4>
+          <p>Discussions take place on GitHub:</p>
+          <ul>
+            <li><a href="https://github.com/orgs/opencast/discussions">
+                GitHub Discussions</a> –
+              Main discussion forum for Opencast</li>
+          </ul>
+          <p>There are also a few additional Google Groups mailing lists:</p>
           <ul>
-            <li><a href="https://groups.google.com/a/opencast.org/forum/#!forum/security-notices">
-                security-notices@opencast.org</a> –
-                Security announcements (low frequency)</li>
             <li><a href="https://groups.google.com/a/opencast.org/forum/#!forum/announcements">
                 announcements@opencast.org</a> –
                 Community announcements (low frequency)</li>
-            <li><a href="https://groups.google.com/a/opencast.org/forum/#!forum/users">
-                users@opencast.org</a> –
-                Users list</li>
-            <li><a href="https://groups.google.com/a/opencast.org/forum/#!forum/dev">
-                dev@opencast.org</a> –
-                Developers list</li>
             <li><a href="https://groups.google.com/a/opencast.org/forum/#!forum/anwender">
                 anwender@opencast.org</a> –
                 German speaking community list</li>
@@ -427,8 +424,8 @@ <h4>Mailing lists</h4>
                 Opencast Annotation Tool list</li>
           </ul>
 
-          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>).
+          You can subscribe via Google Groups (linked above) or simply by sending an e-mail to
+          <em>[list]+subscribe@opencast.org</em> (e.g. <em>lms+subscribe@opencast.org</em>).
         </div>
 
         <div class="col-md-6">