diff --git a/goss/s-mon.yaml b/goss/s-mon.yaml
index df189ff..6f060fb 100644
--- a/goss/s-mon.yaml
+++ b/goss/s-mon.yaml
@@ -1,92 +1,62 @@
-package:
-  apache2:
-    installed: true
-  zabbix-server-mysql:
-    installed: true
-  zabbix-frontend-php:
-    installed: true
-  zabbix-apache-conf:
-    installed: true
-  zabbix-sql-scripts:
-    installed: true
-  zabbix-agent:
-    installed: true
-  mariadb-server:
-    installed: true
-  python3-pymysql:
-    installed: true
-  systemd-journal-remote:
-    installed: true
 file:
-  /etc/systemd/system/systemd-journal-remote.service:
-    exist: true
-    mode: "0777"
-    filetype: directory
-  /var/log/journal/remote:
-    exist: true
-    mode: "0777"
-    filetype: directory
-port:
-  tcp:80:
-    listening: true
-    ip:
-    - 0.0.0.0
-  tcp:3306:
-    listening: true
-    ip:
-    - 127.0.0.1
-  tcp:10050:
-    listening: true
-    ip:
-    - 0.0.0.0
-  tcp:10051:
-    listening: true
-    ip:
-    - 0.0.0.0
-  tcp:19532:
-    listening: true
-    ip:
-      - '*'
+    /etc/systemd/system/systemd-journal-remote.service:
+        exists: true
+        mode: "0644"
+        owner: root
+        group: root
+        filetype: file
+        contents: []
+    /var/log/journal/remote:
+        exists: true
+        mode: "0755"
+        owner: systemd-journal-remote
+        group: systemd-journal-remote
+        filetype: directory
+        contents: []
+package:
+    apache2:
+        installed: true
+        versions:
+            - 2.4.57-2
+    mariadb-server:
+        installed: true
+        versions:
+            - 1:10.11.4-1~deb12u1
+    systemd-journal-remote:
+        installed: true
+        versions:
+            - 252.19-1~deb12u1
 service:
-  apache2:
-    enabled: true
-    running: true
-  zabbix-server:
-    enabled: true
-    running: true
-  zabbix-agent:
-    enabled: true
-    running: true
-  systemd-journal-remote.socket:
-    enabled: true
-    running: true
-command:
-  sysctl net.ipv4.ip_forward:
-    exit-status: 0
-    stdout:
-    - net.ipv4.ip_forward = 0
-    stderr: []
-    timeout: 10000
-process:
-  apache2:
-    running: true
-  zabbix_server:
-    running: true
-  mariadb:
-    running: true
+    apache2:
+        enabled: true
+        running: true
+    mariadb.service:
+        enabled: true
+        running: true
+    systemd-journal-remote.socket:
+        enabled: true
+        running: true
+    zabbix-agent:
+        enabled: true
+        running: true
+    zabbix-server:
+        enabled: true
+        running: true
 interface:
-  enp0s3:
-    exists: true
-    addrs:
-    - 192.168.99.8/24
-  enp0s8:
-    exists: true
-    addrs:
-    - 172.16.0.8/24
+    enp0s3:
+        exists: true
+        addrs:
+            - 192.168.99.8/24
+        mtu: 1500
+    enp0s8:
+        exists: true
+        addrs:
+            - 172.16.0.8/24
+        mtu: 1500
 http:
-  http://localhost/zabbix:
-    status: 401
-    allow-insecure: false
-    no-follow-redirects: false
-    timeout: 5000
-    body: []
+    http://s-mon.gsb.lan/zabbix:
+        status: 200
+        allow-insecure: false
+        no-follow-redirects: false
+        timeout: 5000
+        body: []