diff --git a/docker-compose.yml b/docker-compose.yml
index 94de08819..67279315d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,14 +1,16 @@
 version: '3.5'
 
 services:
-  caddy:
-    image: abiosoft/caddy:1.0.3-no-stats
-    depends_on:
-     - photoprism
-    ports:
-      - 2015:2015
-    volumes:
-      - ./docker/development/Caddyfile:/etc/Caddyfile
+  # caddy:
+  #  image: caddy:2
+  #  depends_on:
+  #   - photoprism
+  #  ports:
+  #    - "80:80"
+  #    - "443:443"
+  #  volumes:
+  #    - ./docker/development/caddy:/data/caddy/pki/authorities/local
+  #    - ./docker/development/caddy/Caddyfile:/etc/caddy/Caddyfile
 
   photoprism:
     build: .
diff --git a/docker/development/Caddyfile b/docker/development/Caddyfile
deleted file mode 100644
index a72a70065..000000000
--- a/docker/development/Caddyfile
+++ /dev/null
@@ -1,10 +0,0 @@
-* {
-    tls off
-    gzip
-    
-    proxy / photoprism:2342 {
-        # Test broken websocket connection.
-        # websocket
-        transparent
-    }
-}
diff --git a/docker/development/caddy/.gitignore b/docker/development/caddy/.gitignore
new file mode 100644
index 000000000..be870b428
--- /dev/null
+++ b/docker/development/caddy/.gitignore
@@ -0,0 +1,2 @@
+*.crt
+*.key
diff --git a/docker/development/caddy/Caddyfile b/docker/development/caddy/Caddyfile
new file mode 100644
index 000000000..8a9606f56
--- /dev/null
+++ b/docker/development/caddy/Caddyfile
@@ -0,0 +1,3 @@
+*, localhost {
+    reverse_proxy photoprism:2342
+}