diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index 64b53c9ed..d1bdca72d 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -269,13 +269,13 @@ jobs:
           - test: M6
             flavor_id: sidechain
             demo_name: demo-shielding-unshielding-multiworker
-            host: self-hosted
+            host: ubuntu-latest
             sgx_mode: HW
           - test: BestEnergy
             flavor_id: offchain-worker
             demo_name: demo-energy-market
             host: self-hosted
-            sgx_mode: HW
+            sgx_mode: SW
           - test: M8
             flavor_id: sidechain
             demo_name: demo-direct-call