From b0b9c59fd5d89f63927d4b704767a166405525e3 Mon Sep 17 00:00:00 2001
From: peaklabs-dev <122374094+peaklabs-dev@users.noreply.github.com>
Date: Mon, 5 Jan 2026 12:12:10 +0100
Subject: [PATCH] chore(service): improve n8n v2

- update n8n to the latest version
- change all env variables to v2 naming
- improve some defaults
- formatting, ordering and spacing
---
 templates/compose/n8n-with-postgresql.yaml | 21 +++++++++++--------
 templates/compose/n8n.yaml                 | 24 ++++++++++++----------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/templates/compose/n8n-with-postgresql.yaml b/templates/compose/n8n-with-postgresql.yaml
index 6e98bceea..0cf58de18 100644
--- a/templates/compose/n8n-with-postgresql.yaml
+++ b/templates/compose/n8n-with-postgresql.yaml
@@ -7,14 +7,15 @@
 
 services:
   n8n:
-    image: n8nio/n8n:2.1.4
+    image: n8nio/n8n:2.1.5
     environment:
       - SERVICE_URL_N8N_5678
       - N8N_EDITOR_BASE_URL=${SERVICE_URL_N8N}
       - WEBHOOK_URL=${SERVICE_URL_N8N}
       - N8N_HOST=${SERVICE_URL_N8N}
-      - GENERIC_TIMEZONE=${GENERIC_TIMEZONE:-Europe/Berlin}
-      - TZ=${TZ:-Europe/Berlin}
+      - N8N_PROTOCOL=${N8N_PROTOCOL:-https}
+      - GENERIC_TIMEZONE=${GENERIC_TIMEZONE:-UTC}
+      - TZ=${TZ:-UTC}
       - DB_TYPE=postgresdb
       - DB_POSTGRESDB_DATABASE=${POSTGRES_DB:-n8n}
       - DB_POSTGRESDB_HOST=postgresql
@@ -22,13 +23,13 @@ services:
       - DB_POSTGRESDB_USER=$SERVICE_USER_POSTGRES
       - DB_POSTGRESDB_SCHEMA=public
       - DB_POSTGRESDB_PASSWORD=$SERVICE_PASSWORD_POSTGRES
-      - N8N_RUNNERS_ENABLED=${N8N_RUNNERS_ENABLED:-true}
-      - N8N_RUNNERS_MODE=${N8N_RUNNERS_MODE:-external}
+      - N8N_RUNNERS_ENABLED=true
+      - N8N_RUNNERS_MODE=external
       - N8N_RUNNERS_BROKER_LISTEN_ADDRESS=${N8N_RUNNERS_BROKER_LISTEN_ADDRESS:-0.0.0.0}
-      - N8N_RUNNERS_AUTH_TOKEN=$SERVICE_PASSWORD_N8N
       - N8N_RUNNERS_BROKER_PORT=${N8N_RUNNERS_BROKER_PORT:-5679}
-      - N8N_RUNNERS_N8N_CONCURRENCY=${N8N_RUNNERS_N8N_CONCURRENCY:-0}
+      - N8N_RUNNERS_AUTH_TOKEN=$SERVICE_PASSWORD_N8N
       - N8N_NATIVE_PYTHON_RUNNER=${N8N_NATIVE_PYTHON_RUNNER:-true}
+      - N8N_RUNNERS_MAX_CONCURRENCY=${N8N_RUNNERS_MAX_CONCURRENCY:-5}
       - N8N_BLOCK_ENV_ACCESS_IN_NODE=${N8N_BLOCK_ENV_ACCESS_IN_NODE:-true}
       - N8N_GIT_NODE_DISABLE_BARE_REPOS=${N8N_GIT_NODE_DISABLE_BARE_REPOS:-true}
       - N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=${N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS:-true}
@@ -44,13 +45,14 @@ services:
       interval: 5s
       timeout: 20s
       retries: 10
+
   task-runners:
-    image: n8nio/runners:2.1.4
+    image: n8nio/runners:2.1.5
     environment:
       - N8N_RUNNERS_TASK_BROKER_URI=${N8N_RUNNERS_TASK_BROKER_URI:-http://n8n:5679}
       - N8N_RUNNERS_AUTH_TOKEN=$SERVICE_PASSWORD_N8N
       - N8N_RUNNERS_AUTO_SHUTDOWN_TIMEOUT=${N8N_RUNNERS_AUTO_SHUTDOWN_TIMEOUT:-15}
-      - N8N_RUNNERS_ENABLED=${N8N_RUNNERS_ENABLED:-javascript,python}
+      - N8N_RUNNERS_MAX_CONCURRENCY=${N8N_RUNNERS_MAX_CONCURRENCY:-5}
     depends_on:
       - n8n
     healthcheck:
@@ -60,6 +62,7 @@ services:
       interval: 5s
       timeout: 20s
       retries: 10
+
   postgresql:
     image: postgres:16-alpine
     volumes:
diff --git a/templates/compose/n8n.yaml b/templates/compose/n8n.yaml
index 52a41328c..0743e30ec 100644
--- a/templates/compose/n8n.yaml
+++ b/templates/compose/n8n.yaml
@@ -7,22 +7,23 @@
 
 services:
   n8n:
-    image: n8nio/n8n:2.1.4
+    image: n8nio/n8n:2.1.5
     environment:
       - SERVICE_URL_N8N_5678
       - N8N_EDITOR_BASE_URL=${SERVICE_URL_N8N}
       - WEBHOOK_URL=${SERVICE_URL_N8N}
-      - N8N_HOST=${SERVICE_URL_N8N}
-      - GENERIC_TIMEZONE=${GENERIC_TIMEZONE:-Europe/Berlin}
-      - TZ=${TZ:-Europe/Berlin}
+      - N8N_HOST=${SERVICE_FQDN_N8N}
+      - N8N_PROTOCOL=${N8N_PROTOCOL:-https}
+      - GENERIC_TIMEZONE=${GENERIC_TIMEZONE:-UTC}
+      - TZ=${TZ:-UTC}
       - DB_SQLITE_POOL_SIZE=${DB_SQLITE_POOL_SIZE:-3}
-      - N8N_RUNNERS_ENABLED=${N8N_RUNNERS_ENABLED:-true}
-      - N8N_RUNNERS_MODE=${N8N_RUNNERS_MODE:-external}
+      - N8N_RUNNERS_ENABLED=true
+      - N8N_RUNNERS_MODE=external
       - N8N_RUNNERS_BROKER_LISTEN_ADDRESS=${N8N_RUNNERS_BROKER_LISTEN_ADDRESS:-0.0.0.0}
-      - N8N_RUNNERS_AUTH_TOKEN=$SERVICE_PASSWORD_N8N
       - N8N_RUNNERS_BROKER_PORT=${N8N_RUNNERS_BROKER_PORT:-5679}
-      - N8N_RUNNERS_N8N_CONCURRENCY=${N8N_RUNNERS_N8N_CONCURRENCY:-0}
+      - N8N_RUNNERS_AUTH_TOKEN=${SERVICE_PASSWORD_N8N}
       - N8N_NATIVE_PYTHON_RUNNER=${N8N_NATIVE_PYTHON_RUNNER:-true}
+      - N8N_RUNNERS_MAX_CONCURRENCY=${N8N_RUNNERS_MAX_CONCURRENCY:-5}
       - N8N_BLOCK_ENV_ACCESS_IN_NODE=${N8N_BLOCK_ENV_ACCESS_IN_NODE:-true}
       - N8N_GIT_NODE_DISABLE_BARE_REPOS=${N8N_GIT_NODE_DISABLE_BARE_REPOS:-true}
       - N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=${N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS:-true}
@@ -35,13 +36,14 @@ services:
       interval: 5s
       timeout: 20s
       retries: 10
+
   task-runners:
-    image: n8nio/runners:2.1.4
+    image: n8nio/runners:2.1.5
     environment:
       - N8N_RUNNERS_TASK_BROKER_URI=${N8N_RUNNERS_TASK_BROKER_URI:-http://n8n:5679}
-      - N8N_RUNNERS_AUTH_TOKEN=$SERVICE_PASSWORD_N8N
+      - N8N_RUNNERS_AUTH_TOKEN=${SERVICE_PASSWORD_N8N}
       - N8N_RUNNERS_AUTO_SHUTDOWN_TIMEOUT=${N8N_RUNNERS_AUTO_SHUTDOWN_TIMEOUT:-15}
-      - N8N_RUNNERS_ENABLED=${N8N_RUNNERS_ENABLED:-javascript,python}
+      - N8N_RUNNERS_MAX_CONCURRENCY=${N8N_RUNNERS_MAX_CONCURRENCY:-5}
     depends_on:
       - n8n
     healthcheck: