diff --git a/Dockerfile b/Dockerfile
index 8e73f51e37260e6d2b072727765081b8c0e0a015..6d4683074e9e54a4955ff6938a092261ea638c3f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,7 +14,7 @@ ARG SNAPPY_VERSION="2.27.2"
 ARG SNAPPY_THEME_VERSION="2.0.0"
 ARG USER_MIGRATION_JOB_ID="608716"
 
-RUN sed -i 's/25,0,6,1/25,0,6,5/' ${BASE_DIR}/version.php
+RUN sed -i 's/25,0,6,1/25,0,6,6/' ${BASE_DIR}/version.php
 COPY custom_entrypoint.sh /
 RUN chmod +x /custom_entrypoint.sh
 RUN mkdir -p /var/www/skeleton/Documents && mkdir -p /var/www/skeleton/Images
@@ -184,6 +184,7 @@ RUN patch -u ${BASE_DIR}/lib/private/Notification/Manager.php -i ${TMP_PATCH_DIR
 RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/user_ldap/lib/User_LDAP.php -i ${TMP_PATCH_DIR}/023-ldap-check-pwd-optimization.patch
 RUN patch -u ${BASE_DIR}/lib/private/User/Manager.php -i ${TMP_PATCH_DIR}/025-optimize-get-by-email.patch
 RUN patch -u ${BASE_DIR}/apps/dav/lib/Connector/Sabre/Principal.php -i ${TMP_PATCH_DIR}/027-displayname-user-leak-dav.patch
+RUN patch -u ${BASE_DIR}/apps/dav/lib/HookManager.php -i ${TMP_PATCH_DIR}/028-default-task-calendar.patch
 RUN rm -rf ${TMP_PATCH_DIR}
 
 RUN curl -fsSL -o ldap_write_support.tar.gz \
diff --git a/patches/028-default-task-calendar.patch b/patches/028-default-task-calendar.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e182ef6d1953d4e0423dddeb83a879ac8dac324e
--- /dev/null
+++ b/patches/028-default-task-calendar.patch
@@ -0,0 +1,20 @@
+From: Avinash Gusain <avinash.gusain.ext@murena.com>
+Date: Fri, 16 June 2023 18:50:00 +0530
+Subject: [PATCH] Create a task calendar on first login
+
+This patch creates a default task VTODO calender on first login
+
+--- ./apps/dav/lib/HookManager.php	2023-06-16 19:01:35.894535512 +0530
++++ ./apps/dav/lib/HookManager-new.php	2023-06-16 19:07:09.374531373 +0530
+@@ -179,6 +179,11 @@
+ 						'{http://apple.com/ns/ical/}calendar-color' => $this->themingDefaults->getColorPrimary(),
+ 						'components' => 'VEVENT'
+ 					]);
++					$this->calDav->createCalendar($principal, 'tasks', [
++						'{DAV:}displayname' => 'Tasks',
++						'{http://apple.com/ns/ical/}calendar-color' => $this->themingDefaults->getColorPrimary(),
++						'components' => 'VTODO'
++					]);
+ 				} catch (\Exception $e) {
+ 					\OC::$server->get(LoggerInterface::class)->error($e->getMessage(), ['exception' => $e]);
+ 				}