diff --git a/config/_default/hugo.toml b/config/_default/hugo.toml
index 17b3a068ee71741c476be8bf10e803b8d749f070..d123c54000e7ffba47ce75f1bd0868e9828ff6ce 100644
--- a/config/_default/hugo.toml
+++ b/config/_default/hugo.toml
@@ -49,7 +49,7 @@ source = "static"
 target = "static"
 
 [[module.imports]]
-path = "gitlab.kit.edu/kit/fs-etit/www-ag/website-modules/opening-hours"
+path = "gitlab.kit.edu/kit/fs-etit/www-ag/website-modules/calendar"
 disable = false
 [[module.imports.mounts]]
 source = "content/de"
@@ -104,5 +104,4 @@ gitServer = 'gitlab.kit.edu'
 gitPath = 'kit/fs-etit/www-ag/website'
 gitBranch = 'main'
 
-fsCalendar = "https://caldav.fs-etit.kit.edu/public.php/public/openinghours/"
 MinutesApiUrl = "https://protokolle.fs-etit.kit.edu"
diff --git a/content/service/opening-hours.en.md b/content/service/opening-hours.en.md
new file mode 100644
index 0000000000000000000000000000000000000000..5be9e00bac7627b2af44f60d16504ee8eee8dfca
--- /dev/null
+++ b/content/service/opening-hours.en.md
@@ -0,0 +1,9 @@
+---
+title: Opening Hours
+menu:
+    main:
+        parent: service
+hideDate: true
+---
+
+{{< calendar ics="https://caldav.fs-etit.kit.edu/public.php/public/openinghours/" >}}
\ No newline at end of file
diff --git a/content/service/opening-hours.md b/content/service/opening-hours.md
new file mode 100644
index 0000000000000000000000000000000000000000..f3e6d373ce297833d80c5a432f781aa6396e0549
--- /dev/null
+++ b/content/service/opening-hours.md
@@ -0,0 +1,10 @@
+---
+title: Öffnungszeiten
+menu:
+    main:
+        parent: service
+hideDate: true
+slug: oeffnungszeiten
+---
+
+{{< calendar ics="https://caldav.fs-etit.kit.edu/public.php/public/openinghours/" >}}
\ No newline at end of file
diff --git a/go.mod b/go.mod
index 4facd806cfe5008af2e41c986d3653d3ae12f867..615e7092f78b9cd96085b505a006fd6cc79a7d5c 100644
--- a/go.mod
+++ b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/gohugoio/hugo-mod-jslibs-dist/popperjs/v2 v2.21100.20000 // indirect
 	github.com/lipis/flag-icons v7.2.3+incompatible // indirect
 	github.com/twbs/bootstrap v5.3.3+incompatible // indirect
-	gitlab.kit.edu/kit/fs-etit/www-ag/website-modules/available-minutes v0.0.0-20240703093600-adecdf8f73bf // indirect
-	gitlab.kit.edu/kit/fs-etit/www-ag/website-modules/opening-hours v0.0.0-20240415225540-7f762b74fb00 // indirect
+	gitlab.kit.edu/kit/fs-etit/www-ag/website-modules/available-minutes v0.0.0-20240819192222-f6681130fb7a // indirect
+	gitlab.kit.edu/kit/fs-etit/www-ag/website-modules/calendar v0.0.0-20240826194754-acc1f7f385cd // indirect
 	gitlab.kit.edu/kit/fs-etit/www-ag/website-modules/timetables v0.0.0-20240415191818-b9e45b26479a // indirect
 )
diff --git a/go.sum b/go.sum
index 79601cba12bbcef14d14e4c68552c46f7509a738..b121d0990d15eb244d3e7cd2874f73b83f10bfbc 100644
--- a/go.sum
+++ b/go.sum
@@ -34,6 +34,10 @@ gitlab.kit.edu/kit/fs-etit/www-ag/website-modules/available-minutes v0.0.0-20240
 gitlab.kit.edu/kit/fs-etit/www-ag/website-modules/available-minutes v0.0.0-20240703093151-96153b6ee78c/go.mod h1:ShFAmGcPPDkRZ2fl+ElsXrJib+xWi9n3IU9DZvX76kI=
 gitlab.kit.edu/kit/fs-etit/www-ag/website-modules/available-minutes v0.0.0-20240703093600-adecdf8f73bf h1:Mle/KbKuD+30nz8sVPst7KsdV65jreMC6DdrDrvQDtI=
 gitlab.kit.edu/kit/fs-etit/www-ag/website-modules/available-minutes v0.0.0-20240703093600-adecdf8f73bf/go.mod h1:ShFAmGcPPDkRZ2fl+ElsXrJib+xWi9n3IU9DZvX76kI=
+gitlab.kit.edu/kit/fs-etit/www-ag/website-modules/available-minutes v0.0.0-20240819192222-f6681130fb7a h1:EIHC7k7hlwSG01swymqtQvIalQ9/Y0si7wDa66AgFrs=
+gitlab.kit.edu/kit/fs-etit/www-ag/website-modules/available-minutes v0.0.0-20240819192222-f6681130fb7a/go.mod h1:ShFAmGcPPDkRZ2fl+ElsXrJib+xWi9n3IU9DZvX76kI=
+gitlab.kit.edu/kit/fs-etit/www-ag/website-modules/calendar v0.0.0-20240826194754-acc1f7f385cd h1:FsBw80sPOfQnXivfZIxEegXgc+1rpbvK97yeBLJVbPY=
+gitlab.kit.edu/kit/fs-etit/www-ag/website-modules/calendar v0.0.0-20240826194754-acc1f7f385cd/go.mod h1:ZYbKUX2U+Dhfx8LNVQTEvhfIfh3jBFfXF1IkXxflUCY=
 gitlab.kit.edu/kit/fs-etit/www-ag/website-modules/opening-hours v0.0.0-20240408223052-cd04dd4080b8 h1:ymSPyI3T86c97ojtiGaTqGfzVp3tIVPbOwk9/rf96Kw=
 gitlab.kit.edu/kit/fs-etit/www-ag/website-modules/opening-hours v0.0.0-20240408223052-cd04dd4080b8/go.mod h1:91aq9G7Xr1yrVXKkDp77klbPbhzbAxOB2+SW5WdcI1g=
 gitlab.kit.edu/kit/fs-etit/www-ag/website-modules/opening-hours v0.0.0-20240415225540-7f762b74fb00 h1:TYC3rJeC0SsdFOLeLVgq6Olp9POc1Zl1tP/JsAshGgc=