diff --git a/asciidoc/troubleshooting/collecting-diagnostics-for-support.adoc b/asciidoc/troubleshooting/collecting-diagnostics-for-support.adoc
index 1e69d4e0..25507c1d 100644
--- a/asciidoc/troubleshooting/collecting-diagnostics-for-support.adoc
+++ b/asciidoc/troubleshooting/collecting-diagnostics-for-support.adoc
@@ -42,27 +42,52 @@ When contacting SUSE Support, providing comprehensive diagnostic information is
 * *For SL Micro*: Check the https://documentation.suse.com/sle-micro/5.5/html/SLE-Micro-all/cha-adm-support-slemicro.html[SUSE Linux Micro Troubleshooting Guide] documentation on how to gather system information for support with `supportconfig`.
 * *For RKE2/Rancher*: Check the https://www.suse.com/support/kb/doc/?id=000020191[The Rancher v2.x Linux log collector script] article to run The Rancher v2.x Linux log collector script.
 
-////
-
-* *Nessie*: Nessie is a powerful diagnostic tool designed to collect logs and configuration data from SUSE Edge environments. It gathers comprehensive information from both the host system and Kubernetes clusters, making it invaluable for troubleshooting and support. To collect logs from a SUSE Edge cluster, connect to any of the control plane nodes and run:
+* *For Edge (Nessie)*: Nessie is a powerful diagnostic tool designed to collect logs and configuration data from SUSE Edge environments. It gathers comprehensive information from both the host system and Kubernetes clusters, making it invaluable for troubleshooting and support. 
+** Nessie has two "modes" a kubernetes mode and a system mode.
+*** To collect logs from a SUSE Edge cluster, run (provided that you have access to the kubeconfig file locally):
 +
 [,shell]
 ----
-podman run --privileged \
+podman run --rm --privileged \
   -v /etc/rancher/k3s/k3s.yaml:/etc/rancher/k3s/k3s.yaml:ro \
   -v /var/log/journal:/var/log/journal:ro \
   -v /run/systemd:/run/systemd:ro \
   -v /etc/machine-id:/etc/machine-id:ro \
-  -v /tmp/nessie-logs:/tmp/cluster-logs \
-  ghcr.io/gagrio/nessie
+  -v /tmp:/tmp \
+  -e NESSIE_LOG_DIR="/tmp" \
+  -e NESSIE_ZIP_DIR="/tmp" \
+  registry.suse.com/edge/3.4/nessie:1.0.0
 ----
 +
 [NOTE]
 ====
 Adjust the paths of the `k3s.yaml/rke2.yaml` file if needed. See https://github.com/suse-edge/support-tools/blob/main/nessie/README.md[Nessie] for more information.
+You should be able to run this container in non-privileged mode if you have proper permissions (typically `k3s.yaml` / `rke2-server.yaml` files are owned by root).
+====
+*** To collect logs in the system mode from the actual operating system, run:
++
+[,shell]
+----
+podman run --rm --privileged \
+  -v /var/log/journal:/var/log/journal:ro \
+  -v /run/systemd:/run/systemd:ro \
+  -v /etc/machine-id:/etc/machine-id:ro \
+  -v /tmp:/tmp \
+  -e NESSIE_LOG_DIR="/tmp" \
+  -e NESSIE_ZIP_DIR="/tmp" \
+  -e NESSIE_VERBOSE="1" \
+  -e NESSIE_SKIP_POD_LOGS="true" \
+  -e NESSIE_SKIP_K8S_CONFIGS="true" \
+  -e NESSIE_SKIP_METRICS="true" \
+  registry.suse.com/edge/3.4/nessie:1.0.0
+----
++
+[NOTE]
+====
+Please make sure to check https://github.com/suse-edge/support-tools/blob/main/nessie/README.md[Nessie] for more details and information on how to run Nessie in your environment.
+Likewise, you should be able to run this container in non-privileged mode provided you have proper permissions.
 ====
 
-////
 
 .Contact Support
 Please check the article available at https://www.suse.com/support/kb/doc/?id=000019452[How-to effectively work with SUSE Technical Support] and the support handbook located at https://www.suse.com/support/handbook/[SUSE Technical Support Handbook] for more details on how to contact SUSE support.
diff --git a/asciidoc/troubleshooting/general-troubleshooting-principles.adoc b/asciidoc/troubleshooting/general-troubleshooting-principles.adoc
index 995cabfb..380d18e9 100644
--- a/asciidoc/troubleshooting/general-troubleshooting-principles.adoc
+++ b/asciidoc/troubleshooting/general-troubleshooting-principles.adoc
@@ -25,4 +25,4 @@ Before diving into component-specific issues, consider these general principles:
 * *Isolate the problem*: Try to narrow down the issue to a specific component or layer (for example, network, storage, OS, Kubernetes, Metal^3^, Ironic,...).
 * *Documentation*: Always refer to the official https://documentation.suse.com/suse-edge/[SUSE Edge documentation] and also upstream documentation for detailed information.
 * *Versions*: SUSE Edge is an opinionated and thoroughly tested version of different SUSE components. The versions of each component per SUSE Edge release can be observed in the https://documentation.suse.com/suse-edge/support-matrix/html/support-matrix/index.html[SUSE Edge support matrix].
-* *Known issues*: For each SUSE Edge release there is a “Known issues” section on the release notes that contains information of issues that will be fixed on future releases but can affect the current one.
\ No newline at end of file
+* *Known issues*: For each SUSE Edge release there is a “Known issues” section on the release notes that contains information of issues that will be fixed on future releases but can affect the current one.