diff --git a/caddy/Caddyfile b/caddy/Caddyfile
new file mode 100644
index 000000000..9da4e546d
--- /dev/null
+++ b/caddy/Caddyfile
@@ -0,0 +1,26 @@
+{
+    # General Options
+    debug
+}
+
+:8000
+
+reverse_proxy /system/* https://autoupdate:8002 {
+    flush_interval -1
+
+    transport http {
+        tls_insecure_skip_verify
+        versions 2
+    }
+}
+
+@server {
+    path /apps/*
+    path /rest/*
+    path /server-version.txt
+}
+reverse_proxy @server server:8000
+
+reverse_proxy /media/* media:8000
+
+reverse_proxy client:4200
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index 9ef7a3d12..aa03e96ed 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -45,13 +45,13 @@ services:
   redis:
     image: redis:latest
 
-  haproxy:
-    image: os3-haproxy-dev
+  caddy:
+    image: caddy:2.3.0-alpine
     volumes:
-      - ../haproxy/src:/usr/local/etc/haproxy
+      - ../caddy/Caddyfile:/etc/caddy/Caddyfile
     depends_on:
       - client
       - server
       - autoupdate
     ports:
-      - "8000:8000"
\ No newline at end of file
+      - "8000:8000"