diff --git a/templates/compose/n8n.yaml b/templates/compose/n8n.yaml
index 4e886b408..52a41328c 100644
--- a/templates/compose/n8n.yaml
+++ b/templates/compose/n8n.yaml
@@ -7,7 +7,7 @@
 
 services:
   n8n:
-    image: docker.n8n.io/n8nio/n8n:1.119.2
+    image: n8nio/n8n:2.1.4
     environment:
       - SERVICE_URL_N8N_5678
       - N8N_EDITOR_BASE_URL=${SERVICE_URL_N8N}
@@ -17,10 +17,17 @@ services:
       - TZ=${TZ:-Europe/Berlin}
       - 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_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_NATIVE_PYTHON_RUNNER=${N8N_NATIVE_PYTHON_RUNNER:-true}
       - 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}
       - N8N_PROXY_HOPS=${N8N_PROXY_HOPS:-1}
+      - N8N_SKIP_AUTH_ON_OAUTH_CALLBACK=${N8N_SKIP_AUTH_ON_OAUTH_CALLBACK:-false}
     volumes:
       - n8n-data:/home/node/.n8n
     healthcheck:
@@ -28,3 +35,19 @@ services:
       interval: 5s
       timeout: 20s
       retries: 10
+  task-runners:
+    image: n8nio/runners:2.1.4
+    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}
+    depends_on:
+      - n8n
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - 'wget -qO- http://127.0.0.1:5680/'
+      interval: 5s
+      timeout: 20s
+      retries: 10