diff --git a/caddy/Caddyfile b/deckard/caddy/Caddyfile
similarity index 100%
rename from caddy/Caddyfile
rename to deckard/caddy/Caddyfile
diff --git a/caddy/docker-compose.yml b/deckard/caddy/docker-compose.yml
similarity index 100%
rename from caddy/docker-compose.yml
rename to deckard/caddy/docker-compose.yml
diff --git a/caddy/sites/dev.hamann-ausgabe.de b/deckard/caddy/sites/dev.hamann-ausgabe.de
similarity index 100%
rename from caddy/sites/dev.hamann-ausgabe.de
rename to deckard/caddy/sites/dev.hamann-ausgabe.de
diff --git a/caddy/sites/hamann-ausgabe.de b/deckard/caddy/sites/hamann-ausgabe.de
similarity index 100%
rename from caddy/sites/hamann-ausgabe.de
rename to deckard/caddy/sites/hamann-ausgabe.de
diff --git a/caddy/sites/hamann-kolloquium.de b/deckard/caddy/sites/hamann-kolloquium.de
similarity index 100%
rename from caddy/sites/hamann-kolloquium.de
rename to deckard/caddy/sites/hamann-kolloquium.de
diff --git a/caddy/sites/theodor-springmann-stiftung.de b/deckard/caddy/sites/theodor-springmann-stiftung.de
similarity index 100%
rename from caddy/sites/theodor-springmann-stiftung.de
rename to deckard/caddy/sites/theodor-springmann-stiftung.de
diff --git a/panoptikum/caddy/Caddyfile b/panoptikum/caddy/Caddyfile
new file mode 100644
index 0000000..8df3166
--- /dev/null
+++ b/panoptikum/caddy/Caddyfile
@@ -0,0 +1,5 @@
+{
+    email it@tss-hd.de
+}
+
+import sites/*
diff --git a/panoptikum/caddy/docker-compose.yml b/panoptikum/caddy/docker-compose.yml
new file mode 100644
index 0000000..c468654
--- /dev/null
+++ b/panoptikum/caddy/docker-compose.yml
@@ -0,0 +1,27 @@
+services:
+  caddy:
+    # Use the official Caddy image
+    image: docker.io/library/caddy:latest
+    # Always restart the container unless it's manually stopped
+    restart: unless-stopped
+    ports:
+      - "80:80"
+      - "443:443"
+      # HTTP3:
+      - "443:443/udp"
+    volumes:
+      - ./Caddyfile:/etc/caddy/Caddyfile
+      - ./sites:/etc/caddy/sites
+      - caddy_data:/data
+      - caddy_config:/config
+    networks:
+      - caddynet
+
+networks:
+  caddynet:
+    external: true
+
+# Define the named volumes for persistent storage
+volumes:
+  caddy_data:
+  caddy_config:
diff --git a/panoptikum/caddy/sites/status.tss-hd.de b/panoptikum/caddy/sites/status.tss-hd.de
new file mode 100644
index 0000000..4ddafab
--- /dev/null
+++ b/panoptikum/caddy/sites/status.tss-hd.de
@@ -0,0 +1,4 @@
+status.tss-hd.de {
+    reverse_proxy uptime-kuma:3001
+}
+
diff --git a/panoptikum/uptime-kuma.yml b/panoptikum/uptime-kuma.yml
new file mode 100644
index 0000000..7823cca
--- /dev/null
+++ b/panoptikum/uptime-kuma.yml
@@ -0,0 +1,16 @@
+services:
+  uptime-kuma:
+    image: louislam/uptime-kuma:1
+    container_name: uptime-kuma
+    restart: unless-stopped
+    volumes:
+      - uptime-kuma:/app/data
+    networks:
+      - caddynet
+
+volumes:
+  uptime-kuma:
+    
+networks:
+  caddynet:
+    external: true