diff --git a/tools/idf_py_actions/diag/recipes/idf.yml b/tools/idf_py_actions/diag/recipes/idf.yml
index 473b6adbe6..b2de9bbb74 100644
--- a/tools/idf_py_actions/diag/recipes/idf.yml
+++ b/tools/idf_py_actions/diag/recipes/idf.yml
@@ -6,7 +6,6 @@ steps:
     cmds:
       - exec:
         cmd: 'idf.py --version'
-        timeout: 10
         output: esp_idf.ver
 
   - name: 'ESP-IDF Git Version'
@@ -14,16 +13,3 @@ steps:
       - exec:
         cmd: 'git -C ${IDF_PATH} describe'
         output: esp_idf_git.ver
-
-  - name: 'Platform Information'
-    cmds:
-      - exec:
-        cmd:
-          - python
-          - -c
-          - |
-            import platform
-            print(f'system: {platform.system()}')
-            print(f'release: {platform.release()}')
-            print(f'machine: {platform.machine()}')
-        output: platform.inf
diff --git a/tools/idf_py_actions/diag/recipes/system.yml b/tools/idf_py_actions/diag/recipes/system.yml
new file mode 100644
index 0000000000..c1c9edaab4
--- /dev/null
+++ b/tools/idf_py_actions/diag/recipes/system.yml
@@ -0,0 +1,49 @@
+description: System information
+tags: [system, base, project]
+steps:
+  - name: 'Platform Information'
+    cmds:
+      - exec:
+        cmd:
+          - python
+          - -c
+          - |
+            import platform
+            print(f'system: {platform.system()}')
+            print(f'release: {platform.release()}')
+            print(f'machine: {platform.machine()}')
+        output: platform.inf
+
+  - name: 'Linux System Information'
+    system: Linux
+    output: linux
+    cmds:
+      - file:
+        path: '/proc/cpuinfo'
+      - file:
+        path: '/etc/os-release'
+      - exec:
+        cmd: 'uname -a'
+        output: uname
+
+  - name: 'Darwin Information'
+    system: Darwin
+    output: darwin
+    cmds:
+      - exec:
+        cmd: 'sysctl machdep.cpu'
+        output: machdep.cpu
+      - exec:
+        cmd: 'sw_vers'
+        output: sw_vers
+      - exec:
+        cmd: 'uname -a'
+        output: uname
+
+  - name: 'Windows Information'
+    system: Windows
+    output: windows
+    cmds:
+      - exec:
+        cmd: 'systeminfo'
+        output: systeminfo