diff --git a/services/webodm.hcl b/services/webodm.hcl
index bfd1661..747b218 100644
--- a/services/webodm.hcl
+++ b/services/webodm.hcl
@@ -3,9 +3,23 @@ job "odm" {
 
   group "admin" {
     network {
+      # webodm
       port "ui" {
         to = 8000
       }
+
+      # clusterodm
+      port "cluster" {
+        to = 10000
+      }
+      port "cli" {
+        static = 18080
+        to = 8080
+      }
+      port "api" {
+        static = 3001
+        to = 3000
+      }
     }
 
     task "web" {
@@ -60,6 +74,40 @@ EOH
         ]
       }
     }
+
+    task "cluster" {
+      driver = "docker"
+
+      config {
+        image = "opendronemap/clusterodm"
+        ports = [
+          "cluster",
+          "cli",
+          "api",
+        ]
+      }
+
+      service {
+        name = "clusterodm"
+        port = "cluster"
+
+        tags = [
+          "traefik.enable=true",
+          "traefik.http.routers.clusterodm.entryPoints=websecure",
+          "traefik.http.routers.clusterodm.middlewares=authentik@file",
+        ]
+      }
+
+      service {
+        name = "clusterodm-api"
+        port = "api"
+      }
+
+      service {
+        name = "clusterodm-cli"
+        port = "cli"
+      }
+    }
   }
 
   group "worker" {
@@ -119,7 +167,7 @@ EOH
       }
     }
 
-    task "nodeodm" {
+    task "node" {
       driver = "docker"
 
       config {
@@ -129,11 +177,10 @@ EOH
 
       resources {
         cpu = 1000
-        memory = 512
+        memory = 2048
       }
 
       service {
-        name = "nodeodm"
         port = "api"
       }
     }