diff --git a/services/beancount.hcl b/services/beancount.hcl
index 531f0c6..87e6fdd 100644
--- a/services/beancount.hcl
+++ b/services/beancount.hcl
@@ -22,7 +22,7 @@ job "beancount" {
         image = "gitea.v.paler.net/ppetru/fava:latest"
         ports = ["http"]
         volumes = [
-          "/data/compute/appdata/beancount:/beancount",
+          "/data/services/beancount:/beancount",
         ]
       }
 
diff --git a/services/code-server.hcl b/services/code-server.hcl
index 1c942ff..27c93de 100644
--- a/services/code-server.hcl
+++ b/services/code-server.hcl
@@ -36,7 +36,7 @@ job "code-server" {
         ports = ["http"]
 
         volumes = [
-          "/data/compute/appdata/code:/home/coder",
+          "/data/services/code:/home/coder",
         ]
       }
 
diff --git a/services/evcc.hcl b/services/evcc.hcl
index 2c04c74..3af811f 100644
--- a/services/evcc.hcl
+++ b/services/evcc.hcl
@@ -32,8 +32,8 @@ job "evcc" {
         ]
 
         volumes = [
-          "/data/compute/appdata/evcc/evcc.yaml:/etc/evcc.yaml",
-          "/data/compute/appdata/evcc/evcc:/root/.evcc",
+          "/data/services/evcc/evcc.yaml:/etc/evcc.yaml",
+          "/data/services/evcc/evcc:/root/.evcc",
         ]
       }
 
diff --git a/services/maps.hcl b/services/maps.hcl
index 012f0da..2b07933 100644
--- a/services/maps.hcl
+++ b/services/maps.hcl
@@ -20,7 +20,7 @@ job "maps" {
         ports = ["http"]
         volumes = [
           "/data/shared/alo_gis:/srv/projects/alo_gis",
-          "/data/compute/appdata/maps/qgis-server-plugins:/plugins",
+          "/data/services/maps/qgis-server-plugins:/plugins",
         ]
       }
 
@@ -65,7 +65,7 @@ job "maps" {
         to = 80
       }
       port "php" {
-        static = 9000
+        static = 9001
       }
     }
 
@@ -77,14 +77,14 @@ job "maps" {
         ports = ["php"]
         volumes = [
           "/data/shared/alo_gis:/srv/projects/alo_gis",
-          "/data/compute/appdata/maps/var/lizmap-theme-config:/www/lizmap/var/lizmap-theme-config",
-          "/data/compute/appdata/maps/var/lizmap-config:/www/lizmap/var/config",
-          "/data/compute/appdata/maps/var/lizmap-db:/www/lizmap/var/db",
-          "/data/compute/appdata/maps/var/lizmap-log:/www/lizmap/var/log",
-          "/data/compute/appdata/maps/www:/www/lizmap/www",
-          "/data/compute/appdata/maps/var/lizmap-modules:/www/lizmap/var/lizmap-modules",
-          "/data/compute/appdata/maps/var/lizmap-my-packages:/www/lizmap/var/my-packages",
-          "/data/compute/appdata/maps/etc:/srv/etc:ro",
+          "/data/services/maps/var/lizmap-theme-config:/www/lizmap/var/lizmap-theme-config",
+          "/data/services/maps/var/lizmap-config:/www/lizmap/var/config",
+          "/data/services/maps/var/lizmap-db:/www/lizmap/var/db",
+          "/data/services/maps/var/lizmap-log:/www/lizmap/var/log",
+          "/data/services/maps/www:/www/lizmap/www",
+          "/data/services/maps/var/lizmap-modules:/www/lizmap/var/lizmap-modules",
+          "/data/services/maps/var/lizmap-my-packages:/www/lizmap/var/my-packages",
+          "/data/services/maps/etc:/srv/etc:ro",
         ]
 
         command = "php-fpm"
@@ -117,10 +117,10 @@ job "maps" {
         image = "nginx:alpine"
         ports = ["http"]
         volumes = [
-          "/data/compute/appdata/maps/etc/nginx.conf:/etc/nginx/nginx.conf:ro",
-          "/data/compute/appdata/maps/var/nginx-log:/var/log/nginx",
-          "/data/compute/appdata/maps/var/nginx-cache:/var/cache/nginx",
-          "/data/compute/appdata/maps/www:/srv/lizmap/www",
+          "/data/services/maps/etc/nginx.conf:/etc/nginx/nginx.conf:ro",
+          "/data/services/maps/var/nginx-log:/var/log/nginx",
+          "/data/services/maps/var/nginx-cache:/var/cache/nginx",
+          "/data/services/maps/www:/srv/lizmap/www",
         ]
       }
 
diff --git a/services/media.hcl b/services/media.hcl
index e2c07b0..13d3b28 100644
--- a/services/media.hcl
+++ b/services/media.hcl
@@ -22,7 +22,7 @@ job "media" {
         image = "ghcr.io/hotio/radarr:latest"
         ports = [ "radarr" ]
         volumes = [
-          "/data/compute/appdata/radarr:/config",
+          "/data/services/media/radarr:/config",
           "/data/media:/data",
         ]
       }
@@ -56,7 +56,7 @@ job "media" {
         image = "ghcr.io/hotio/sonarr:latest"
         ports = [ "sonarr" ]
         volumes = [
-          "/data/compute/appdata/sonarr-working:/config",
+          "/data/services/media/sonarr:/config",
           "/data/media:/data",
         ]
       }
@@ -90,7 +90,7 @@ job "media" {
         image = "ghcr.io/hotio/bazarr:latest"
         ports = [ "bazarr" ]
         volumes = [
-          "/data/compute/appdata/bazarr:/config",
+          "/data/services/media/bazarr:/config",
           "/data/media/media:/data/media",
         ]
       }
@@ -125,7 +125,7 @@ job "media" {
         ports = [ "pms" ]
         network_mode = "host"
         volumes = [
-          "/data/compute/appdata/plex:/config",
+          "/data/services/media/plex:/config",
           "/data/media/media:/data",
         ]
       }
@@ -163,7 +163,7 @@ job "media" {
           "qbt_torrent",
         ]
         volumes = [
-          "/data/compute/appdata/qbittorrent:/config",
+          "/data/services/media/qbittorrent:/config",
           "/data/media/torrents:/data/torrents",
         ]
       }
diff --git a/services/netbox.hcl b/services/netbox.hcl
index a03ea5a..6843960 100644
--- a/services/netbox.hcl
+++ b/services/netbox.hcl
@@ -15,10 +15,10 @@ job "netbox" {
         image = "docker.io/netboxcommunity/netbox:v3.7-2.8.0"
         ports = ["http"]
         volumes = [
-          "/data/compute/appdata/netbox/configuration:/etc/netbox/config:z,ro",
-          "/data/compute/appdata/netbox/media:/opt/netbox/media",
-          "/data/compute/appdata/netbox/reports:/opt/netbox/reports",
-          "/data/compute/appdata/netbox/files:/opt/netbox/scripts",
+          "/data/services/netbox/configuration:/etc/netbox/config:z,ro",
+          "/data/services/netbox/media:/opt/netbox/media",
+          "/data/services/netbox/reports:/opt/netbox/reports",
+          "/data/services/netbox/files:/opt/netbox/scripts",
         ]
       }
 
@@ -71,10 +71,10 @@ job "netbox" {
           "rqworker",
         ]
         volumes = [
-          "/data/compute/appdata/netbox/configuration:/etc/netbox/config:z,ro",
-          "/data/compute/appdata/netbox/media:/opt/netbox/media",
-          "/data/compute/appdata/netbox/reports:/opt/netbox/reports",
-          "/data/compute/appdata/netbox/files:/opt/netbox/scripts",
+          "/data/services/netbox/configuration:/etc/netbox/config:z,ro",
+          "/data/services/netbox/media:/opt/netbox/media",
+          "/data/services/netbox/reports:/opt/netbox/reports",
+          "/data/services/netbox/files:/opt/netbox/scripts",
         ]
       }
 
@@ -101,10 +101,10 @@ job "netbox" {
         image = "docker.io/netboxcommunity/netbox:v3.7-2.8.0"
         command = "/opt/netbox/housekeeping.sh"
         volumes = [
-          "/data/compute/appdata/netbox/configuration:/etc/netbox/config:z,ro",
-          "/data/compute/appdata/netbox/media:/opt/netbox/media",
-          "/data/compute/appdata/netbox/reports:/opt/netbox/reports",
-          "/data/compute/appdata/netbox/files:/opt/netbox/scripts",
+          "/data/services/netbox/configuration:/etc/netbox/config:z,ro",
+          "/data/services/netbox/media:/opt/netbox/media",
+          "/data/services/netbox/reports:/opt/netbox/reports",
+          "/data/services/netbox/files:/opt/netbox/scripts",
         ]
       }
 
diff --git a/services/traefik.hcl b/services/traefik.hcl
index 73758f2..5ff5adc 100644
--- a/services/traefik.hcl
+++ b/services/traefik.hcl
@@ -62,7 +62,7 @@ job "traefik" {
         network_mode = "host"
         volumes = [
           "local/traefik.yml:/etc/traefik/traefik.yml",
-          "/data/compute/config/traefik:/config",
+          "/data/services/traefik:/config",
         ]
       }
 
diff --git a/services/urbit.hcl b/services/urbit.hcl
index ba77880..282ee38 100644
--- a/services/urbit.hcl
+++ b/services/urbit.hcl
@@ -28,7 +28,7 @@ job "urbit" {
           "--loom=31",
         ]
         volumes = [
-          "/data/compute/appdata/urbit:/urbit",
+          "/data/services/urbit:/urbit",
         ]
       }
 
diff --git a/services/velutrack.hcl b/services/velutrack.hcl
index 41ed3fc..8524b7f 100644
--- a/services/velutrack.hcl
+++ b/services/velutrack.hcl
@@ -24,7 +24,7 @@ job "velutrack" {
           "-enable-health",
         ]
 
-        volumes = [ "/data/compute/appdata/velutrack/dist:/srv/http" ]
+        volumes = [ "/data/services/velutrack/dist:/srv/http" ]
       }
     }