diff --git a/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/calendar.inc.php b/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/calendar.inc.php
index b0471677..643f196e 100644
--- a/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/calendar.inc.php
+++ b/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/calendar.inc.php
@@ -1,29 +1,30 @@
 <?php
-    $config['calendar_driver'] = "kolab";
+    $config['calendar_driver'] = "caldav";
     $config['calendar_default_view'] = "agendaWeek";
     $config['calendar_timeslots'] = 2;
     $config['calendar_first_day'] = 1;
     $config['calendar_first_hour'] = 6;
     $config['calendar_work_start'] = 6;
     $config['calendar_work_end'] = 18;
     $config['calendar_event_coloring'] = 0;
-    $config['calendar_caldav_url'] = 'http://%h/iRony/calendars/%u/%i';
+    $config['calendar_caldav_url'] = 'http://%h/dav/calendars/%u/%i';
+    $config['calendar_caldav_server'] = "https://" . ($_SERVER["HTTP_HOST"] ?? null) . "/dav/";
 
     $config['calendar_itip_smtp_server'] = '';
     $config['calendar_itip_smtp_user'] = '';
     $config['calendar_itip_smtp_pass'] = '';
 
     $config['calendar_itip_send_option'] = 3;
     $config['calendar_itip_after_action'] = 0;
 
     $config['calendar_freebusy_trigger'] = false;
 
     $config['kolab_invitation_calendars'] = true;
 
     $config['calendar_contact_birthdays'] = true;
 
     if (file_exists(RCUBE_CONFIG_DIR . '/' . ($_SERVER["HTTP_HOST"] ?? null) . '/' . basename(__FILE__))) {
         include_once(RCUBE_CONFIG_DIR . '/' . ($_SERVER["HTTP_HOST"] ?? null) . '/' . basename(__FILE__));
     }
 
 ?>
diff --git a/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/kolab_addressbook.inc.php b/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/kolab_addressbook.inc.php
index a2851bb6..6487d5c5 100644
--- a/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/kolab_addressbook.inc.php
+++ b/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/kolab_addressbook.inc.php
@@ -1,20 +1,23 @@
 <?php
 
 
 // This option allows to set addressbooks priority or to disable some
 // of them. Disabled addressbooks will be not shown in the UI. Default: 0.
 // 0 - "Global address book(s) first". Use all address books, starting with the global (LDAP)
 // 1 - "Personal address book(s) first". Use all address books, starting with the personal (Kolab)
 // 2 - "Global address book(s) only". Use the global (LDAP) addressbook. Disable the personal.
 // 3 - "Personal address book(s) only". Use the personal (Kolab) addressbook(s). Disable the global.
 $config['kolab_addressbook_prio'] = 0;
 
 // Base URL to build fully qualified URIs to access address books via CardDAV
 // The following replacement variables are supported:
 // %h - Current HTTP host
 // %u - Current webmail user name
 // %n - Folder name
 // %i - Folder UUID
 $config['kolab_addressbook_carddav_url'] = 'http://%h/dav/addressbooks/%u/%i';
 
+$config['kolab_addressbook_carddav_server'] = "https://" . ($_SERVER["HTTP_HOST"] ?? null) . "/dav/";
+$config['kolab_addressbook_driver'] = 'carddav';
+
 ?>
diff --git a/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/tasklist.inc.php b/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/tasklist.inc.php
index 399344cd..7e3382a1 100644
--- a/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/tasklist.inc.php
+++ b/docker/roundcube/rootfs/opt/app-root/src/roundcubemail-config-templates/tasklist.inc.php
@@ -1,11 +1,11 @@
 <?php
 
-// backend type (database, kolab)
-$config['tasklist_driver'] = 'kolab';
+$config['tasklist_driver'] = 'caldav';
+$config['tasklist_caldav_server'] = "https://" . ($_SERVER["HTTP_HOST"] ?? null) . "/dav/";
 
 // default sorting order of tasks listing (auto, datetime, startdatetime, flagged, complete, changed)
 $config['tasklist_sort_col'] = '';
 
 // default sorting order for tasks listing (asc or desc)
 $config['tasklist_sort_order'] = 'asc';