diff --git a/docker/swarm/stack/monitoring.yml b/docker/swarm/stack/monitoring.yml
index fdd095a..46a2845 100644
--- a/docker/swarm/stack/monitoring.yml
+++ b/docker/swarm/stack/monitoring.yml
@@ -1,5 +1,7 @@
-include:
+classes:
+- service.prometheus.server.container
 - service.prometheus.alertmanager.container
+- service.prometheus.pushgateway.container
 parameters:
   docker:
     client:
@@ -9,10 +11,11 @@
             monitoring:
               driver: overlay
               driver_opts:
-                encrypted: true
+                encrypted: 1
           service:
             alertmanager:
-              network: monitoring
+              networks:
+                - monitoring
               deploy:
                 replicas: 2
                 restart_policy:
@@ -21,14 +24,15 @@
               ports:
                 - 15011:${prometheus:alertmanager:bind:port}
               volumes:
-                - /srv/volumes/prometheus:/opt/prometheus/config
+                - /srv/volumes/prometheus:/opt/alertmanager/config
               environment:
                 config_dir: /opt/alertmanager/config
                 bind_port: ${prometheus:alertmanager:bind:port}
                 bind_address: ${prometheus:alertmanager:bind:address}
-                discovery_domain: 'prometheus_alertmanager'
+                discovery_domain: 'monitoring_alertmanager'
             pushgateway:
-              network: monitoring
+              networks:
+                - monitoring
               deploy:
                 replicas: 2
                 restart_policy:
@@ -37,7 +41,8 @@
               ports:
                 - 15012:9091
             server:
-              network: monitoring
+              networks:
+                - monitoring
               deploy:
                 replicas: 1
                 restart_policy:
@@ -57,4 +62,4 @@
                 storage_local_memory_chunks: ${prometheus:server:storage:local:memory_chunks}
                 storage_local_max_chunks_to_persist: ${prometheus:server:storage:local:max_chunks_to_persist}
                 storage_local_num_fingerprint_mutexes: ${prometheus:server:storage:local:num_fingerprint_mutexes}
-                discovery_domain: 'prometheus_alertmanager'
+                discovery_domain: 'monitoring_alertmanager'
diff --git a/prometheus/server/target/dns.yml b/prometheus/server/target/dns.yml
index b51f732..5919a91 100644
--- a/prometheus/server/target/dns.yml
+++ b/prometheus/server/target/dns.yml
@@ -5,11 +5,11 @@
         dns:
           - name: 'pushgateway'
             domain:
-            - 'tasks.prometheus_pushgateway'
+            - 'tasks.monitoring_pushgateway'
             type: A
             port: 9091
           - name: 'prometheus'
             domain:
-            - 'tasks.prometheus_server'
+            - 'tasks.monitoring_server'
             type: A
             port: 9090