diff --git a/.github/workflows/spdk-common-tests.yml b/.github/workflows/spdk-common-tests.yml
index cfb0cfd..02542e6 100644
--- a/.github/workflows/spdk-common-tests.yml
+++ b/.github/workflows/spdk-common-tests.yml
@@ -173,6 +173,7 @@ jobs:
         - {name: iscsi-vm-autotest, container_image: ghcr.io/refenv/cijoe-docker:v0.9.54, cijoe_config_prefix: qemuhost-with-guest}
         - {name: iscsi-uring-vm-autotest, container_image: ghcr.io/refenv/cijoe-docker:v0.9.54, cijoe_config_prefix: qemuhost-with-guest}
         - {name: short-fuzz-vm-autotest, container_image: ghcr.io/refenv/cijoe-docker:v0.9.54, cijoe_config_prefix: qemuhost-with-guest}
+        - {name: nvmf-no-huge-container-autotest, container_image: ghcr.io/spdk/spdk-ci:fedora_43, cijoe_config_prefix: container}
         - {name: vfio-user-container-autotest, container_image: ghcr.io/spdk/spdk-ci:fedora_43, cijoe_config_prefix: container}
         - {name: check-format-container-autotest, container_image: ghcr.io/spdk/spdk-ci:fedora_43, cijoe_config_prefix: container}
         - {name: unittest-gcc-container-autotest, container_image: ghcr.io/spdk/spdk-ci:fedora_43, cijoe_config_prefix: container}
@@ -214,7 +215,7 @@ jobs:
     # cijoe - for running cijoe workflows instead of writing own manual scrits;
     #         TODO: Installation doesn't take long but we should bake it into the container image.
     - name: Install cijoe
-      if: ${{ contains(matrix.workflow.name, 'container') }}
+      if: ${{ contains(matrix.workflow.name, '-container-') }}
       run: |
         pip install cijoe==0.9.54
 
@@ -260,7 +261,7 @@ jobs:
         tar xzf spdk-abi.tar.gz --strip 1
 
     - name: Restore qcow2 image from cache
-      if: contains(matrix.workflow.name, 'vm')  || contains(matrix.workflow.name, 'vfio-user')
+      if: contains(matrix.workflow.name, '-vm-')  || contains(matrix.workflow.name, 'vfio-user')
       id: restore-qcow2
       uses: actions/cache/restore@v4
       with:
@@ -269,7 +270,7 @@ jobs:
 
     - name: Download VM Qcow2 image artifact
       uses: actions/download-artifact@v4.1.8
-      if: (contains(matrix.workflow.name, 'vm')  || contains(matrix.workflow.name, 'vfio-user')) && hashFiles(format('{0}_x86_64.qcow2',
+      if: (contains(matrix.workflow.name, '-vm-')  || contains(matrix.workflow.name, 'vfio-user')) && hashFiles(format('{0}_x86_64.qcow2',
         matrix.distro)) == ''
       with:
         name: vm-image-${{matrix.distro}}_x86_64
@@ -277,7 +278,7 @@ jobs:
         run-id: ${{ fromJson(needs.checkout_spdk.outputs.artifact_id)[ matrix.distro ] }}
 
     - name: qemu-guest, initialize
-      if: ${{ contains(matrix.workflow.name, 'vm') }}
+      if: ${{ contains(matrix.workflow.name, '-vm-') }}
       run: |
         cd ci/cijoe
         cijoe workflows/autorun.yaml guest_initialize guest_start guest_check \
@@ -311,7 +312,7 @@ jobs:
         --monitor
 
     - name: qemu-guest, shutdown
-      if: ${{ contains(matrix.workflow.name, 'vm') && contains(runner.labels, 'self-hosted') || env.ACT == 'true' }}
+      if: ${{ contains(matrix.workflow.name, '-vm-') && contains(runner.labels, 'self-hosted') || env.ACT == 'true' }}
       run: |
         cd ci/cijoe
         cijoe workflows/autorun.yaml guest_shutdown \
diff --git a/cijoe/configs/autorun_configs/nvmf-no-huge-container-autotest.conf b/cijoe/configs/autorun_configs/nvmf-no-huge-container-autotest.conf
new file mode 100644
index 0000000..dd16add
--- /dev/null
+++ b/cijoe/configs/autorun_configs/nvmf-no-huge-container-autotest.conf
@@ -0,0 +1,10 @@
+SPDK_RUN_FUNCTIONAL_TEST=1
+SPDK_TEST_NVMF=1
+SPDK_TEST_NVMF_TRANSPORT=tcp
+SPDK_RUN_UBSAN=1
+SPDK_RUN_ASAN=1
+NET_TYPE=virt
+SPDK_TEST_NO_HUGE=1
+SPDK_TEST_SKIP_NVMF_KERNEL_TESTS=1
+SKIP_HUGE=1
+export DRIVER_OVERRIDE=none
\ No newline at end of file
diff --git a/cijoe/workflows/autorun.yaml b/cijoe/workflows/autorun.yaml
index 489d398..d2bf652 100644
--- a/cijoe/workflows/autorun.yaml
+++ b/cijoe/workflows/autorun.yaml
@@ -94,6 +94,10 @@ steps:
     ln -sfn /usr/local/bin/perl /usr/bin/perl
     USE_INSTALLED_CONTIGMEM=yes SKIP_HUGE=yes TEST_MIN_STORAGE_SIZE=0 SYSDIR="{{ local.env.HOME }}/git/freebsd/sys" /opt/spdk/autorun.sh /opt/configs/freebsd-vm-autotest.conf
 
+- name: nvmf-no-huge-container-autotest
+  run: |
+    /opt/spdk/autorun.sh /opt/configs/nvmf-no-huge-container-autotest.conf
+
 - name: unittest-gcc-container-autotest
   run: |
     rootdir=/opt/spdk && cd $rootdir && source ./test/common/autobuild_common.sh /opt/configs/unittest-gcc-container-autotest.conf && ocf_precompile && unittest_build && ./test/unit/unittest.sh