diff --git a/scenarios/sno-2-bm/bootstrap_vars.yml b/scenarios/sno-2-bm/bootstrap_vars.yml
index 9beb22eb..50abd854 100644
--- a/scenarios/sno-2-bm/bootstrap_vars.yml
+++ b/scenarios/sno-2-bm/bootstrap_vars.yml
@@ -5,7 +5,7 @@ os_router_external_network: public
 
 scenario: sno-2-bm
 scenario_dir: scenarios
-stack_template_path: "{{ scenario_dir }}/{{ scenario }}/heat_template_ipxe.yaml"
+stack_template_path: "{{ scenario_dir }}/{{ scenario }}/heat_template_mixed.yaml"
 automation_vars_file: "{{ scenario_dir }}/{{ scenario }}/automation-vars.yml"
 test_operator_automation_vars_file: "{{ scenario_dir }}/{{ scenario }}/test-operator/automation-vars.yml"
 
diff --git a/scenarios/sno-2-bm/heat_template.yaml b/scenarios/sno-2-bm/heat_template.yaml
index b74a53fc..b1537f36 100644
--- a/scenarios/sno-2-bm/heat_template.yaml
+++ b/scenarios/sno-2-bm/heat_template.yaml
@@ -519,16 +519,9 @@ resources:
       flavor: {get_param: [ironic_params, flavor]}
       block_device_mapping_v2:
         - device_type: disk
-          boot_index: 1
           image_id: {get_param: [ironic_params, image]}
           volume_size: 40
           delete_on_termination: true
-        - device_type: cdrom
-          disk_bus: {get_param: cdrom_disk_bus}
-          boot_index: 0
-          image_id: {get_param: [ironic_params, cd_image]}
-          volume_size: 5
-          delete_on_termination: true
       networks:
         - port: {get_resource: ironic0-port}
 
@@ -544,16 +537,9 @@ resources:
       flavor: {get_param: [ironic_params, flavor]}
       block_device_mapping_v2:
         - device_type: disk
-          boot_index: 1
           image_id: {get_param: [ironic_params, image]}
           volume_size: 40
           delete_on_termination: true
-        - device_type: cdrom
-          disk_bus: {get_param: cdrom_disk_bus}
-          boot_index: 0
-          image_id: {get_param: [ironic_params, cd_image]}
-          volume_size: 5
-          delete_on_termination: true
       networks:
         - port: {get_resource: ironic1-port}
 
@@ -571,6 +557,10 @@ outputs:
     description: Ironic boot interface configured for the redfish nodes
     value: redfish-virtual-media
 
+  sushy_tools_vmedia_type:
+    description: Sushy-tools virtual media implementation type
+    value: rescue
+
   network_mtu:
     description: MTU values for all networks
     value:
diff --git a/scenarios/sno-2-bm/heat_template_mixed.yaml b/scenarios/sno-2-bm/heat_template_mixed.yaml
index 7ca4d511..3ac35cc2 100644
--- a/scenarios/sno-2-bm/heat_template_mixed.yaml
+++ b/scenarios/sno-2-bm/heat_template_mixed.yaml
@@ -517,18 +517,7 @@ resources:
     type: OS::Nova::Server
     properties:
       flavor: {get_param: [ironic_params, flavor]}
-      block_device_mapping_v2:
-        - device_type: disk
-          boot_index: 1
-          image_id: {get_param: [ironic_params, image]}
-          volume_size: 40
-          delete_on_termination: true
-        - device_type: cdrom
-          disk_bus: {get_param: cdrom_disk_bus}
-          boot_index: 0
-          image_id: {get_param: [ironic_params, cd_image]}
-          volume_size: 5
-          delete_on_termination: true
+      image: {get_param: [ironic_params, image]}
       networks:
         - port: {get_resource: ironic0-port}
 
@@ -560,6 +549,10 @@ outputs:
     description: Ironic boot interface configured for the redfish nodes
     value: mixed
 
+  sushy_tools_vmedia_type:
+    description: Sushy-tools virtual media implementation type
+    value: rescue
+
   network_mtu:
     description: MTU values for all networks
     value:
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 27c439dc..80904928 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -110,9 +110,12 @@
     attempts: 1
     vars:
       scenario: sno-2-bm
-      stack_template_path: "{{ scenario_dir }}/{{ scenario }}/heat_template_ipxe.yaml"
     files:
       - ^scenarios/sno-2-bm/.*
+      - ^roles/redfish_virtual_bmc/.*
+      - ^roles/redfish_vbmc_podman/.*
+      - ^roles/nova_console_recorder/.*
+      - ^roles/nova_console_poller/.*
 
 - job:
     name: vexxhost-hotstack-3-nodes
@@ -126,7 +129,12 @@
       scenario: 3-nodes
     files:
       - ^scenarios/3-nodes/.*
-      - ^roles/.*
+      - ^roles/controller/.*
+      - ^roles/dataplane_ssh_keys/.*
+      - ^roles/heat_stack/.*
+      - ^roles/hotlogs/.*
+      - ^roles/hotloop/.*
+      - ^roles/ocp_agent_installer/.*
 
 - job:
     name: vexxhost-hotstack-3-nodes-update