diff --git a/caddy/Caddyfile b/caddy/Caddyfile
new file mode 100644
index 0000000..b963c7a
--- /dev/null
+++ b/caddy/Caddyfile
@@ -0,0 +1,23 @@
+(cloudflare) {
+        tls {
+                dns cloudflare APIKEY
+                resolvers 1.1.1.1
+        }
+}
+*.fqdn.de {
+        import cloudflare
+
+        @cloud host cloud.fqdn.de
+        @collabora host collabora.fqdn.de
+        @wopiserver host wopiserver.fqdn.de
+
+        handle @cloud {
+                reverse_proxy opencloud:9200
+        }
+        handle @collabora {
+                reverse_proxy collabora:9980
+        }
+        handle @wopiserver {
+                reverse_proxy collaboration:9300
+        }
+}
diff --git a/caddy/README.MD b/caddy/README.MD
new file mode 100644
index 0000000..e136847
--- /dev/null
+++ b/caddy/README.MD
@@ -0,0 +1,7 @@
+Here you find two files:
+# docker-compose.caddy.yml 
+# Caddyfile
+After you copied .env.example to .env please add :caddy/docker-compose.caddy.yml as last entry.
+This will install a caddy reverse proxy server along with your OpenCloud deployment.
+As Caddy needs a config file copy the one from /caddy/Caddyfile to your directory.
+Fill your API-Key.
diff --git a/caddy/docker-compose.caddy.yml b/caddy/docker-compose.caddy.yml
new file mode 100644
index 0000000..984cc05
--- /dev/null
+++ b/caddy/docker-compose.caddy.yml
@@ -0,0 +1,29 @@
+services:
+  caddy:
+    image: ghcr.io/caddybuilds/caddy-cloudflare:latest
+    cap_add:
+      - NET_ADMIN
+    container_name: caddy
+    hostname: caddy
+    environment:
+      - CADDY_INGRESS_NETWORKS=opencloud-compose_opencloud-net
+    restart: unless-stopped
+    ports:
+      - "80:80"
+      - "443:443"
+      - "443:443/udp"
+    volumes:
+      - /mnt/docker/caddy/Caddyfile:/etc/caddy/Caddyfile
+      - /mnt/docker/caddy/site:/srv
+      - /mnt/docker/caddy/data:/data
+      - /mnt/docker/caddy/config:/config
+      - /var/run/docker.sock:/var/run/docker.sock
+    networks:
+      opencloud-net: null
+networks:
+  opencloud-net:
+    name: opencloud-compose_opencloud-net
+volumes:
+  data:
+  config:
+  site:
diff --git a/external-proxy/collabora.yml b/external-proxy/collabora.yml
index 3a16c43..3971adf 100644
--- a/external-proxy/collabora.yml
+++ b/external-proxy/collabora.yml
@@ -1,10 +1,12 @@
 ---
 services:
   collaboration:
+    container_name: collaboration    
     ports:
       # expose the wopi server
       - "9300:9300"
   collabora:
+    container_name: collabora
     ports:
       # expose the collabora server
       - "9980:9980"
diff --git a/external-proxy/opencloud.yml b/external-proxy/opencloud.yml
index 121c51d..1b959e7 100644
--- a/external-proxy/opencloud.yml
+++ b/external-proxy/opencloud.yml
@@ -1,6 +1,7 @@
 ---
 services:
   opencloud:
+    container_name: opencloud      
       environment:
         # bind to all interfaces
         PROXY_HTTP_ADDR: "0.0.0.0:9200"