diff --git a/package-lock.json b/package-lock.json
index 692eddf11..2338b113c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
         "@nextcloud/auth": "^2.3.0",
         "@nextcloud/axios": "^2.5.0",
         "@nextcloud/calendar-availability-vue": "^2.2.4",
-        "@nextcloud/calendar-js": "^7.0.0",
+        "@nextcloud/calendar-js": "^8.0.2",
         "@nextcloud/cdav-library": "^1.5.1",
         "@nextcloud/dialogs": "^5.3.6",
         "@nextcloud/event-bus": "^3.3.1",
@@ -30,6 +30,7 @@
         "@nextcloud/logger": "^3.0.2",
         "@nextcloud/moment": "^1.3.1",
         "@nextcloud/router": "^3.0.1",
+        "@nextcloud/timezones": "^0.1.1",
         "@nextcloud/vue": "^8.16.0",
         "autosize": "^6.0.1",
         "color-convert": "^2.0.1",
@@ -3219,30 +3220,18 @@
         "vue": "^2.7.16"
       }
     },
-    "node_modules/@nextcloud/calendar-availability-vue/node_modules/uuid": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
-      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
-      "funding": [
-        "https://github.com/sponsors/broofa",
-        "https://github.com/sponsors/ctavan"
-      ],
-      "license": "MIT",
-      "bin": {
-        "uuid": "dist/bin/uuid"
-      }
-    },
     "node_modules/@nextcloud/calendar-js": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-7.0.0.tgz",
-      "integrity": "sha512-CvCcO4hFPjMfIB2AKW0QLNYukGoHFS7QQVvIC8khJjzNfVGS6qMJd2oaZtD9Q9w1fLpvwp1X7orcYGYmosDkAA==",
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@nextcloud/calendar-js/-/calendar-js-8.0.2.tgz",
+      "integrity": "sha512-um4S/MWdk+CY9r0kfw9WnjMyjs4iGSx0YyTzEdY6pJdB1OkinAtpW45urpjHAs3s+okTB8XqugdtvEwRvbULgw==",
       "engines": {
         "node": "^20.0.0",
         "npm": "^10.0.0"
       },
       "peerDependencies": {
+        "@nextcloud/timezones": "^0.1.1",
         "ical.js": "^2.0.1",
-        "uuid": "^9.0.0"
+        "uuid": "^10.0.0"
       }
     },
     "node_modules/@nextcloud/capabilities": {
@@ -19092,15 +19081,13 @@
       }
     },
     "node_modules/uuid": {
-      "version": "9.0.1",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz",
-      "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz",
+      "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==",
       "funding": [
         "https://github.com/sponsors/broofa",
         "https://github.com/sponsors/ctavan"
       ],
-      "license": "MIT",
-      "peer": true,
       "bin": {
         "uuid": "dist/bin/uuid"
       }
diff --git a/package.json b/package.json
index 00fff783f..4e380e700 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
     "@nextcloud/auth": "^2.3.0",
     "@nextcloud/axios": "^2.5.0",
     "@nextcloud/calendar-availability-vue": "^2.2.4",
-    "@nextcloud/calendar-js": "^7.0.0",
+    "@nextcloud/calendar-js": "^8.0.2",
     "@nextcloud/cdav-library": "^1.5.1",
     "@nextcloud/dialogs": "^5.3.6",
     "@nextcloud/event-bus": "^3.3.1",
@@ -57,6 +57,7 @@
     "@nextcloud/logger": "^3.0.2",
     "@nextcloud/moment": "^1.3.1",
     "@nextcloud/router": "^3.0.1",
+    "@nextcloud/timezones": "^0.1.1",
     "@nextcloud/vue": "^8.16.0",
     "autosize": "^6.0.1",
     "color-convert": "^2.0.1",
diff --git a/src/components/Shared/TimezoneSelect.vue b/src/components/Shared/TimezoneSelect.vue
index 34bd44ea3..7c5903a20 100644
--- a/src/components/Shared/TimezoneSelect.vue
+++ b/src/components/Shared/TimezoneSelect.vue
@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import { getReadableTimezoneName, getSortedTimezoneList } from '@nextcloud/calendar-js'
+import { getReadableTimezoneName, getSortedTimezoneList } from '@nextcloud/timezones'
 import { NcSelect } from '@nextcloud/vue'
 import { translate as t } from '@nextcloud/l10n'
 
diff --git a/src/services/timezoneDataProviderService.js b/src/services/timezoneDataProviderService.js
index 6194d2b15..f510b48e6 100644
--- a/src/services/timezoneDataProviderService.js
+++ b/src/services/timezoneDataProviderService.js
@@ -2,7 +2,7 @@
  * SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-import { getTimezoneManager } from '@nextcloud/calendar-js'
+import { getTimezoneManager } from '@nextcloud/timezones'
 
 const timezoneManager = getTimezoneManager()
 let initialized = false
diff --git a/src/store/calendarObjects.js b/src/store/calendarObjects.js
index f17ce2e3c..812e6a5cb 100644
--- a/src/store/calendarObjects.js
+++ b/src/store/calendarObjects.js
@@ -7,7 +7,6 @@ import logger from '../utils/logger.js'
 import {
 	createEvent,
 	getParserManager,
-	getTimezoneManager,
 	DateTimeValue,
 } from '@nextcloud/calendar-js'
 import useFetchedTimeRangesStore from './fetchedTimeRanges.js'
@@ -15,6 +14,7 @@ import useCalendarsStore from './calendars.js'
 import { defineStore } from 'pinia'
 import useCalendarObjectInstanceStore from './calendarObjectInstance.js'
 import Vue from 'vue'
+import { getTimezoneManager } from '@nextcloud/timezones'
 
 export default defineStore('calendarObjects', {
 	state: () => {
diff --git a/src/store/calendars.js b/src/store/calendars.js
index b8b860081..b688d86ab 100644
--- a/src/store/calendars.js
+++ b/src/store/calendars.js
@@ -16,7 +16,8 @@ import pLimit from 'p-limit'
 import { uidToHexColor } from '../utils/color.js'
 import { translate as t } from '@nextcloud/l10n'
 import getTimezoneManager from '../services/timezoneDataProviderService.js'
-import { CalendarComponent, Timezone, TimezoneComponent } from '@nextcloud/calendar-js'
+import { CalendarComponent, TimezoneComponent } from '@nextcloud/calendar-js'
+import { Timezone } from '@nextcloud/timezones'
 import {
 	CALDAV_BIRTHDAY_CALENDAR,
 	IMPORT_STAGE_IMPORTING,