diff --git a/scripts/diag_new_server.py b/scripts/diag_new_server.py
index 237bb4afe..466bdbc33 100644
--- a/scripts/diag_new_server.py
+++ b/scripts/diag_new_server.py
@@ -25,24 +25,24 @@ def ssh_run(cmd):
     )
     return r.stdout, r.stderr, r.returncode
 
-print("=== Find act_runner binary ===")
-out, err, rc = ssh_run("find / -name 'act_runner' -type f 2>/dev/null | head -20")
+print("=== /opt/act-runner/ structure ===")
+out, err, rc = ssh_run("ls -laR /opt/act-runner/ 2>/dev/null | head -60")
 print(out)
 
-print("\n=== Find runner directories ===")
-out, err, rc = ssh_run("find / -name '.runner' -type f 2>/dev/null | head -20")
+print("\n=== docker ps -a ===")
+out, err, rc = ssh_run("docker ps -a --format 'table {{.Names}}\t{{.Image}}\t{{.Status}}' 2>/dev/null")
 print(out)
 
-print("\n=== Systemd services for runner ===")
-out, err, rc = ssh_run("systemctl list-units --all | grep -i runner")
+print("\n=== docker compose files ===")
+out, err, rc = ssh_run("find /opt -name 'docker-compose*' -o -name 'compose*' 2>/dev/null | head -10")
 print(out)
 
-print("\n=== Current running processes ===")
-out, err, rc = ssh_run("ps aux | grep -i act_runner | grep -v grep")
+print("\n=== Check act_runner version ===")
+out, err, rc = ssh_run("/opt/act-runner/act_runner --version 2>&1")
 print(out)
 
-print("\n=== Docker containers ===")
-out, err, rc = ssh_run("docker ps --format '{{.Names}} {{.Status}}' 2>/dev/null | head -20")
+print("\n=== Any runner config files ===")
+out, err, rc = ssh_run("find /opt/act-runner -name '*.yml' -o -name '*.yaml' -o -name '.runner' 2>/dev/null")
 print(out)
 
 os.unlink(key_path)