diff --git a/roles/vt.archlinux/base/README.rst b/roles/vt.archlinux/base/README.rst
index e07d092..2df9f13 100644
--- a/roles/vt.archlinux/base/README.rst
+++ b/roles/vt.archlinux/base/README.rst
@@ -7,7 +7,8 @@ and networking tasks.
 To learn more about system and network performance tools, take a look at
 the following articles:
 
-- `Linux Performance <http://www.brendangregg.com/linuxperf.html>`_
+- `Linux Performance <https://www.brendangregg.com/linuxperf.html>`_
+- `Linux Crisis Tools <https://www.brendangregg.com/blog/2024-03-24/linux-crisis-tools.html>`_
 - `Every Linux networking tool I know <https://wizardzines.com/networking-tools-poster/>`_
 - `Nmap 6 Cookbook <https://nmapcookbook.blogspot.com/2010/02/nmap-cheat-sheet.html>`_
 
diff --git a/roles/vt.archlinux/base/tasks/cli.yml b/roles/vt.archlinux/base/tasks/cli.yml
index 01946d8..9682a90 100644
--- a/roles/vt.archlinux/base/tasks/cli.yml
+++ b/roles/vt.archlinux/base/tasks/cli.yml
@@ -23,6 +23,7 @@
       - man-pages
       - multitail
       - neofetch
+      - ncdu
       - ncurses
       - parallel
       - p7zip
diff --git a/roles/vt.archlinux/base/tasks/crisis.yml b/roles/vt.archlinux/base/tasks/crisis.yml
new file mode 100644
index 0000000..91d88e0
--- /dev/null
+++ b/roles/vt.archlinux/base/tasks/crisis.yml
@@ -0,0 +1,19 @@
+---
+- name: Install Linux crisis tools
+  # https://www.brendangregg.com/blog/2024-03-24/linux-crisis-tools.html
+  pacman:
+    name:
+      - bcc
+      - bcc-tools
+      - bpftrace
+      - ethtool
+      - htop
+      - iproute2
+      - libcpuid
+      # - nicstat # Replacement: iostat, vmstat from procps-ng
+      - procps-ng
+      - sysstat
+      - tcpdump
+      # - tiptop  # Replacement: htop
+      - util-linux
+    state: present
diff --git a/roles/vt.archlinux/base/tasks/main.yml b/roles/vt.archlinux/base/tasks/main.yml
index c6b617f..3dec9aa 100644
--- a/roles/vt.archlinux/base/tasks/main.yml
+++ b/roles/vt.archlinux/base/tasks/main.yml
@@ -1,4 +1,5 @@
 ---
+- import_tasks: crisis.yml
 - import_tasks: cli.yml
 - import_tasks: networking.yml
 - import_tasks: system.yml
diff --git a/roles/vt.archlinux/base/tasks/networking.yml b/roles/vt.archlinux/base/tasks/networking.yml
index 0fd5494..eda8e58 100644
--- a/roles/vt.archlinux/base/tasks/networking.yml
+++ b/roles/vt.archlinux/base/tasks/networking.yml
@@ -28,7 +28,6 @@
       - p0f
       - sipcalc
       - socat
-      - tcpdump
       - testssl
       - traceroute
       - usbmuxd
diff --git a/roles/vt.archlinux/base/tasks/system.yml b/roles/vt.archlinux/base/tasks/system.yml
index 66c559b..7baccac 100644
--- a/roles/vt.archlinux/base/tasks/system.yml
+++ b/roles/vt.archlinux/base/tasks/system.yml
@@ -10,18 +10,15 @@
       - gparted
       - gptfdisk
       - haveged
-      - htop
       - hyperfine
       - iftop
       - iotop
       - lsof
       - lshw
       - namcap
-      - ncdu
       - os-prober
       - pkgfile
       - smartmontools
       - strace
-      - sysstat
       - testdisk
     state: present