diff --git a/__swarm/zabbix-server/zabbix-server-swarm.yml b/__swarm/zabbix-server/zabbix-server-swarm.yml
index 492f812..12a6feb 100644
--- a/__swarm/zabbix-server/zabbix-server-swarm.yml
+++ b/__swarm/zabbix-server/zabbix-server-swarm.yml
@@ -1,11 +1,10 @@
 networks:
   zabbix:
     driver: overlay
-    attachable: true
     ipam:
       config:
-        - subnet: 192.168.82.0/24
-
+      - subnet: 192.168.89.0/28
+      driver: default
 services:
   db-server:
     env_file:
@@ -13,13 +12,14 @@ services:
     image: ${DOCKER_REGISTRY:-}postgres:16-alpine
     networks:
       zabbix:
+        ipv4_address: 192.168.89.4
     ports:
     - target: 5432
       published: 5432
       protocol: tcp
       mode: ingress
     volumes:
-    - postgres-data:/var/lib/postgresql/data
+    - /share/docker_data/zabbix-server/postgres-data:/var/lib/postgresql/data
     deploy:
       labels:
         com.centurylinklabs.watchtower.enable: 'true'
@@ -33,6 +33,7 @@ services:
     image: ${DOCKER_REGISTRY:-}zabbix/zabbix-web-nginx-pgsql:alpine-latest
     networks:
       zabbix:
+        ipv4_address: 192.168.89.3
     ports:
     - target: 8080
       published: 8051
@@ -43,7 +44,7 @@ services:
       protocol: tcp
       mode: ingress
     volumes:
-    - certs:/usr/share/zabbix/conf/certs
+    - /share/docker_data/zabbix-server/frontend/certs:/usr/share/zabbix/conf/certs
     deploy:
       labels:
         com.centurylinklabs.watchtower.enable: 'true'
@@ -51,16 +52,18 @@ services:
         wud.watch.digest: 'true'
       replicas: 1
       placement:
-        constraints:
-        - node.role == manager
   zabbix-server:
     env_file:
     - stack.env
+    extends:
+      file: logging.yml
+      service: ${LOGGING:-syslog}
     image: ${DOCKER_REGISTRY:-}zabbix/zabbix-server-pgsql:alpine-latest
     volumes:
-    - alertscripts:/usr/lib/zabbix/alertscripts
+    - /share/docker_data/zabbix-server/server/alertscripts:/usr/lib/zabbix/alertscripts
     networks:
       zabbix:
+        ipv4_address: 192.168.89.2
     ports:
     - target: 10051
       published: 10051
@@ -83,9 +86,7 @@ services:
         wud.watch: 'true'
         wud.watch.digest: 'true'
       replicas: 1
-      placement:
-        constraints:
-        - node.role == manager
+
   webdriver:
     ports:
     - target: 4444
@@ -96,15 +97,14 @@ services:
       published: 7900
       protocol: tcp
       mode: ingress
+    shm_size: 2g
     image: ${DOCKER_REGISTRY:-}docker.io/selenium/standalone-chrome:latest
     deploy:
       labels:
         wud.watch: 'true'
         wud.watch.digest: 'true'
       replicas: 1
-      placement:
-        constraints:
-        - node.role == manager
+
   postinstall:
     image: debian:12-slim
     environment:
@@ -114,17 +114,10 @@ services:
     - /usr/bin:/usr/bin
     - /usr/lib:/usr/lib
     - /var/run/docker.sock:/var/run/docker.sock
-    - scripts:/scripts
+    - /share/docker_data/zabbix-server/scripts:/scripts
     entrypoint:
     - /bin/sh
     - /scripts/install-curl.sh
     deploy:
       replicas: 1
-      placement:
-        constraints:
-        - node.role == manager
-volumes:
-  scripts:
-  certs:
-  alertscripts:
-  postgres-data:
+