diff --git a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
index 618b354b7..3ee5bcc54 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
@@ -91,12 +91,12 @@ class Calendar
     private CommentEmbeddable $comment;
 
     /**
-     * @ORM\Column(type="date_immutable")
+     * @ORM\Column(type="datetimetz_immutable")
      */
     private \DateTimeImmutable $startDate;
 
     /**
-     * @ORM\Column(type="date_immutable")
+     * @ORM\Column(type="datetimetz_immutable")
      */
     private \DateTimeImmutable $endDate;
 
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
index 2674573dc..f6df7ccdf 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/show.html.twig
@@ -12,10 +12,10 @@
 <h2 class="chill-red">{{ 'Calendar data'|trans }}</h2>
 
     <dt class="inline">{{ 'start date'|trans }}</dt>
-    <dd>{{ entity.startDate|format_date('long') }}</dd>
+    <dd>{{ entity.startDate|format_datetime('long') }}</dd>
 
     <dt class="inline">{{ 'end date'|trans }}</dt>
-    <dd>{{ entity.endDate|format_date('long') }}</dd>
+    <dd>{{ entity.endDate|format_datetime('long') }}</dd>
 
     <dt class="inline">{{ 'cancel reason'|trans }}</dt>
     <dd>
diff --git a/src/Bundle/ChillCalendarBundle/migrations/Version20210723142003.php b/src/Bundle/ChillCalendarBundle/migrations/Version20210723142003.php
new file mode 100644
index 000000000..0af4fb1b8
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/migrations/Version20210723142003.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Chill\Migrations\Calendar;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Alter startDate and endDate to datetimetz_immutable
+ */
+final class Version20210723142003 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Alter startDate and endDate to datetimetz_immutable';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER startdate TYPE TIMESTAMP(0) WITH TIME ZONE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER startdate DROP DEFAULT');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER enddate TYPE TIMESTAMP(0) WITH TIME ZONE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER enddate DROP DEFAULT');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.startDate IS \'(DC2Type:datetimetz_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.endDate IS \'(DC2Type:datetimetz_immutable)\'');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER startDate TYPE DATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER startDate DROP DEFAULT');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER endDate TYPE DATE');
+        $this->addSql('ALTER TABLE chill_calendar.calendar ALTER endDate DROP DEFAULT');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.startdate IS \'(DC2Type:date_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_calendar.calendar.enddate IS \'(DC2Type:date_immutable)\'');
+    }
+}