diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index 3f0c412..3dddb4d 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -14,6 +14,10 @@ registry.dylanbaird.com {
     reverse_proxy registry:5000
 }
 
+nextcloud.dylanbaird.com {
+    reverse_proxy nextcloud:80
+}
+
 immich.dylanbaird.com {
     reverse_proxy immich-server:2283
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index 305a8c0..787d609 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -113,5 +113,23 @@ services:
     restart: always
     networks:
       - barrios-network
+  nextcloud:
+    image: nextcloud:stable
+    container_name: nextcloud
+    ports:
+      - "8080:80"
+    volumes:
+      - /mertz/nextcloud:/var/www/html
+    environment:
+      - NEXTCLOUD_ADMIN_USER=${NEXTCLOUD_ADMIN_USER}
+      - NEXTCLOUD_ADMIN_PASSWORD=${NEXTCLOUD_ADMIN_PASSWORD}
+      - NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.dylanbaird.com localhost 127.0.0.1
+      - OVERWRITEPROTOCOL=https
+      - OVERWRITEHOST=nextcloud.dylanbaird.com
+    env_file:
+      - .env
+    restart: unless-stopped
+    networks:
+      - barrios-network
 networks:
   barrios-network: