diff --git a/Caddyfile b/Caddyfile
index 60a1c82..bdbf1db 100644
--- a/Caddyfile
+++ b/Caddyfile
@@ -33,3 +33,7 @@ ntfy.tomasrivera.ch {
 notes.tomasrivera.ch {
   reverse_proxy flatnotes:8080
 }
+
+calendar.tomasrivera.ch {
+  reverse_proxy radicale:5232
+}
diff --git a/bootstrap.sh b/bootstrap.sh
index 028ea6a..7b06501 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -156,7 +156,9 @@ mkdir -p \
     /opt/server/filebrowser/database \
     /opt/server/uptime-kuma \
     /opt/server/ntfy \
-    /opt/server/flatnotes
+    /opt/server/flatnotes \
+    /opt/server/radicale/config \
+    /opt/server/radicale/data
 
 sudo chown -R 1000:1000 /opt/server/filebrowser # somehow filebrowser cant acces it
 
diff --git a/compose.yml b/compose.yml
index cf501cc..cae5244 100644
--- a/compose.yml
+++ b/compose.yml
@@ -7,6 +7,8 @@ services:
       - filebrowser
       - uptime-kuma
       - ntfy
+      - flatnotes
+      - radicale
     image: caddy:latest
     container_name: caddy
     restart: unless-stopped
@@ -115,6 +117,20 @@ services:
 
     volumes:
       - /mnt/kdrive/Notes/quicknotes:/data
+  radicale:
+    image: tomsquest/docker-radicale:latest
+    container_name: radicale
+    restart: unless-stopped
+
+    environment:
+      - TZ=Europe/Zurich
+
+    volumes:
+      # Calendar + contacts data
+      - /opt/server/radicale/data:/data
+
+      # Configuration
+      - /opt/server/radicale/config:/config
 volumes:
   caddy_data:
   caddy_config:
diff --git a/web-server/index.html b/web-server/index.html
index 99e82c1..560430e 100644
--- a/web-server/index.html
+++ b/web-server/index.html
@@ -69,6 +69,11 @@
                         <td>Flatnotes</td>
                         <td>Database-less note taking web app</td>
                     </tr>
+                    <tr>
+                        <td><a href="https://calendar.tomasrivera.ch">calendar.tomasrivera.ch</a></td>
+                        <td>Radicalé</td>
+                        <td>Calendar and contact CalDAV and CardDAV server</td>
+                    </tr>
 
                     <tr>
                         <td><a href="https://tomasrivera.ch">tomasrivera.ch</a></td>