diff --git a/.github/workflows/autorun.yml b/.github/workflows/autorun.yml
index be87c106b..7fcc3334b 100644
--- a/.github/workflows/autorun.yml
+++ b/.github/workflows/autorun.yml
@@ -51,7 +51,7 @@ jobs:
 
   autorun_unittest:
     needs: source-archive
-    timeout-minutes: 15
+    timeout-minutes: 30
     runs-on: [self-hosted, linux, x64, qemuhost]
     env:
       REPOSITORY_TARBALL_PATH: ${{ github.workspace }}/repository.tar.gz
@@ -96,14 +96,33 @@ jobs:
         --workflow workflows/autorun_in_qemu.yaml \
         --output report_prep_guest
 
-    - name: qemu-guest, autorun
+    - name: qemu-guest, autorun_unittest
       run: |
         cd ci/cijoe
-        cijoe autorun output_listing retrieve_autorun_output guest_shutdown \
+        cijoe autorun_unittest \
         --monitor \
         --config configs/qemuhost-with-guest-fedora-40.toml \
         --workflow workflows/autorun_in_qemu.yaml \
-        --output report_autorun
+        --output report_autorun_unittest
+
+    - name: qemu-guest, autorun_nvme
+      run: |
+        cd ci/cijoe
+        cijoe autorun_nvme \
+        --monitor \
+        --config configs/qemuhost-with-guest-fedora-40.toml \
+        --workflow workflows/autorun_in_qemu.yaml \
+        --output report_autorun_nvme
+
+    - name: qemu-guest, cleanup
+      if: always()
+      run: |
+        cd ci/cijoe
+        cijoe output_listing retrieve_autorun_output guest_shutdown \
+        --monitor \
+        --config configs/qemuhost-with-guest-fedora-40.toml \
+        --workflow workflows/autorun_in_qemu.yaml \
+        --output report_cleanup
 
     - name: Upload Artifacts
       uses: actions/upload-artifact@v4.4.0
@@ -117,7 +136,9 @@ jobs:
       if: always()
       with:
         path: |
-          ci/cijoe/report_autorun
+          ci/cijoe/report_autorun_nvme
+          ci/cijoe/report_autorun_unittest
+          ci/cijoe/report_cleanup
           ci/cijoe/report_prep_guest
         name: report-autorun-in-qemu
 
diff --git a/cijoe/scripts/qemu_guest_start_custom_nvme.py b/cijoe/scripts/qemu_guest_start_custom_nvme.py
index 856ef22cf..7a5055f9c 100755
--- a/cijoe/scripts/qemu_guest_start_custom_nvme.py
+++ b/cijoe/scripts/qemu_guest_start_custom_nvme.py
@@ -231,18 +231,18 @@ def namespace(controller_id, nsid, aux={}):
     drives.append(drv_pi3)
 
     # Nvme4n4 - NVM namespace with PI type 1 and extended LBA
-    drv_pi1_ex, qemu_nvme_dev_pi1_ex = namespace(
-        controller_id5, 4, {"ms": 8, "mset": 1, "pi": 1}
-    )
-    nvme += qemu_nvme_dev_pi1_ex
-    drives.append(drv_pi1_ex)
+    #drv_pi1_ex, qemu_nvme_dev_pi1_ex = namespace(
+    #    controller_id5, 4, {"ms": 8, "mset": 1, "pi": 1}
+    #)
+    #nvme += qemu_nvme_dev_pi1_ex
+    #drives.append(drv_pi1_ex)
 
     # Nvme4n5 - NVM namespace with PI type 1 and PIF 2
-    drv_pi1_pif2, qemu_nvme_dev_pi1_pif2 = namespace(
-        controller_id5, 5, {"ms": 16, "pi": 1, "pif": 2}
-    )
-    nvme += qemu_nvme_dev_pi1_pif2
-    drives.append(drv_pi1_pif2)
+    #drv_pi1_pif2, qemu_nvme_dev_pi1_pif2 = namespace(
+    #    controller_id5, 5, {"ms": 16, "pi": 1, "pif": 2}
+    #)
+    #nvme += qemu_nvme_dev_pi1_pif2
+    #drives.append(drv_pi1_pif2)
 
     return drives, nvme
 
diff --git a/cijoe/workflows/autorun_in_qemu.yaml b/cijoe/workflows/autorun_in_qemu.yaml
index 3e84c92a4..899ae9c0a 100644
--- a/cijoe/workflows/autorun_in_qemu.yaml
+++ b/cijoe/workflows/autorun_in_qemu.yaml
@@ -34,10 +34,18 @@ steps:
     mkdir /opt/spdk
     tar xzf /tmp/repository.tar.gz -C /opt/spdk
     
-- name: autorun
+- name: autorun_unittest
   run: |
+    mkdir -p /opt/output/unittest
     echo "SPDK_TEST_UNITTEST=1" > /tmp/auto.conf
-    /opt/spdk/autorun.sh /tmp/auto.conf
+    output_dir=/opt/output/unittest /opt/spdk/autorun.sh /tmp/auto.conf
+
+- name: autorun_nvme
+  run: |
+    mkdir -p /opt/output/nvme
+    echo "SPDK_RUN_FUNCTIONAL_TEST=1" > /tmp/auto.conf
+    echo "SPDK_TEST_NVME=1" >> /tmp/auto.conf
+    output_dir=/opt/output/nvme /opt/spdk/autorun.sh /tmp/auto.conf
 
 - name: output_listing
   run: |