diff --git a/conf.d/n8n.conf b/conf.d/n8n.conf
new file mode 100644
index 0000000..95e62be
--- /dev/null
+++ b/conf.d/n8n.conf
@@ -0,0 +1,21 @@
+server {
+    listen 80;
+    server_name n8n.psi.ch;
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name n8n.psi.ch;
+
+    ssl_certificate /etc/nginx/certs/n8n.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/n8n.psi.ch.key;
+
+    location / {
+        proxy_pass http://n8n:5678;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+}
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 6388cf0..4f1dca7 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -156,6 +156,22 @@ services:
     networks:
       - woodpecker_backend
 
+  # Angelo Sozzi INC0150655 angelo.sozzi@psi.ch
+  n8n:
+    image: docker.n8n.io/n8nio/n8n
+    container_name: n8n
+    restart: always
+    environment:
+      - N8N_HOST=${SUBDOMAIN}.${DOMAIN_NAME}
+      - N8N_PORT=5678
+      - N8N_PROTOCOL=https
+      - NODE_ENV=production
+      - WEBHOOK_URL=https://${SUBDOMAIN}.${DOMAIN_NAME}/
+      - GENERIC_TIMEZONE=${GENERIC_TIMEZONE}
+    volumes:
+      - /opt/webcontent/n8n/n8n_data:/home/node/.n8n
+      - /opt/webcontent/n8n/local_files:/files
+
 networks:
   public:
   backend: