diff --git a/ci/ci.js b/ci/ci.js
index b5507b4..c062be9 100644
--- a/ci/ci.js
+++ b/ci/ci.js
@@ -68,7 +68,13 @@ app.post('/payload', (req, res) => {
 });
 
 app.post('/ci_deploy', (req, res) => {
+    console.info(prefix("ARKultur") + "Endpoint: /ci_deploy targeted");
     const name = req.body.repository.name;
+    if (!req.body.workflow_run) {
+        console.info(prefix("ARKultur") + "Not a workflow event");
+        res.status(200).send();
+        return;
+    }
     const branch = req.body.workflow_run.head_branch;
 
     if (canDeploy(req, name))
@@ -85,6 +91,11 @@ app.post('/ci_deploy', (req, res) => {
     res.status(200).send();
 })
 
+app.get('/ci_deploy/ping', (req, res) => {
+    console.info(prefix("ARKultur") + "Endpoint: /ci_deploy/ping targeted");
+    res.status(200).send({message: "Pong"});
+})
+
 app.listen(port, () => {
     console.log(prefix("ARKultur") + "Now listening on port " + port);
     if (!Process.env.CI_BRANCH)
diff --git a/configs/Caddyfile b/configs/Caddyfile
index cf8a2f7..3b2a2dd 100644
--- a/configs/Caddyfile
+++ b/configs/Caddyfile
@@ -2,10 +2,10 @@
 	email contact@creative-rift.com
 }
 
-arkultur.creative-rift.com {
-    route /ci_deploy {
-        reverse_proxy localhost:4567
-    }
+{$SITE_DOMAIN:localhost} {
+	route /ci_deploy* {
+		reverse_proxy {$SITE_ADDRESS:localhost}:4567
+	}
 
 	route /api/* {
 		reverse_proxy api:8080
diff --git a/docker-compose.yml b/docker-compose.yml
index e86d2c2..b781c63 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,6 +10,9 @@ services:
     volumes:
       - ./configs/Caddyfile:/etc/caddy/Caddyfile
       - caddy_data:/data
+    environment:
+      - SITE_ADDRESS=${SITE_ADDRESS}
+      - SITE_DOMAIN=${SITE_DOMAIN}
     restart: unless-stopped
 
   db:
@@ -27,7 +30,7 @@ services:
     restart: unless-stopped
 
   web:
-    image: bogdzn/theed:canon
+    image: bogdzn/theed:${CI_BRANCH}
     container_name: theed
     ports:
       - "3000:3000"
@@ -36,7 +39,7 @@ services:
     restart: unless-stopped
 
   api:
-    image: bogdzn/naboo:canon
+    image: bogdzn/naboo:${CI_BRANCH}
     container_name: naboo
     env_file:
       - .env-api