diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7ce8da0..0382983 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -42,37 +42,52 @@ jobs:
         working-directory: zephyr-silabs
         shell: bash
         run: |
-          west twister -s drivers.entropy -p siwx917_rb4338a -v --inline-logs
+          west twister -v --inline-logs \
+            -s drivers.entropy \
+            -p siwx917_rb4338a
 
       - name: Build Flash test
         working-directory: zephyr-silabs
         shell: bash
         run: |
-          west twister -s drivers.flash.common.default -p siwx917_rb4338a -x DTC_OVERLAY_FILE=$(pwd)/tests/drivers/flash/common/boards/siwx917_rb4338a.overlay -v --inline-logs
+          west twister -v --inline-logs \
+            -s drivers.flash.common.default \
+            -p siwx917_rb4338a \
+            -x DTC_OVERLAY_FILE=$(pwd)/tests/drivers/flash/common/boards/siwx917_rb4338a.overlay
 
       - name: Build DMA test
         working-directory: zephyr-silabs
         shell: bash
         run: |
-          west twister -s drivers.dma.chan_blen_transfer -p siwx917_rb4338a -- \
-            -DTC_OVERLAY_FILE=$(pwd)/tests/drivers/dma/chan_blen_transfer/boards/siwx917_rb4338a.overlay \
-            -DEXTRA_CONF_FILE=$(pwd)/tests/drivers/dma/chan_blen_transfer/boards/siwx917_rb4338a.conf \
-            -v --inline-logs
+          west twister -v --inline-logs \
+            -s drivers.dma.chan_blen_transfer \
+            -p siwx917_rb4338a \
+            -x DTC_OVERLAY_FILE=$(pwd)/tests/drivers/dma/chan_blen_transfer/boards/siwx917_rb4338a.overlay \
+            -x EXTRA_CONF_FILE=$(pwd)/tests/drivers/dma/chan_blen_transfer/boards/siwx917_rb4338a.conf
 
       - name: Build Bluetooth samples
         working-directory: zephyr-silabs
         shell: bash
         run: |
-          west twister -s sample.bluetooth.peripheral_hr -p siwx917_rb4338a -v --inline-logs -K
+          west twister -v --inline-logs -K \
+            -s sample.bluetooth.peripheral_hr \
+            -p siwx917_rb4338a
 
       - name: Build Rail samples
         working-directory: zephyr-silabs
         shell: bash
         run: |
-          west twister -s sample.rail.simple_txrx -T samples -v --inline-logs
+          west twister -v --inline-logs \
+            -s sample.rail.simple_txrx -T samples
 
       - name: Build Wifi samples
         working-directory: zephyr-silabs
         shell: bash
         run: |
-          west twister -s sample.net.wifi -p siwx917_rb4338a -v --inline-logs -K
+          west twister -v --inline-logs -K \
+            -s sample.net.wifi \
+            -p siwx917_rb4338a
+          west twister -v --inline-logs -K \
+            -s sample.net.wifi \
+            -p siwx917_rb4338a \
+            -x EXTRA_CONF_FILE=$(pwd)/samples/net/wifi/shell/soc/siwx917_offloaded_sockets.conf
diff --git a/.github/workflows/upstream-build.yml b/.github/workflows/upstream-build.yml
index 1f357bf..d9c9b88 100644
--- a/.github/workflows/upstream-build.yml
+++ b/.github/workflows/upstream-build.yml
@@ -44,41 +44,54 @@ jobs:
         working-directory: zephyr-silabs
         shell: bash
         run: |
-          west twister -s drivers.entropy -p siwx917_rb4338a -v --inline-logs -K
+          west twister -v --inline-logs -K \
+            -s drivers.entropy \
+            -p siwx917_rb4338a
 
       - name: Build Flash test
         working-directory: zephyr-silabs
         shell: bash
         run: |
-          west twister -s drivers.flash.common.default -p siwx917_rb4338a -x DTC_OVERLAY_FILE=$(pwd)/tests/drivers/flash/common/boards/siwx917_rb4338a.overlay -v --inline-logs
+          west twister -v --inline-logs \
+            -s drivers.flash.common.default \
+            -p siwx917_rb4338a \
+            -x DTC_OVERLAY_FILE=$(pwd)/tests/drivers/flash/common/boards/siwx917_rb4338a.overlay
 
       - name: Build DMA test
         working-directory: zephyr-silabs
         shell: bash
         run: |
-          west twister -s drivers.dma.chan_blen_transfer -p siwx917_rb4338a -- \
-            -DTC_OVERLAY_FILE=$(pwd)/tests/drivers/dma/chan_blen_transfer/boards/siwx917_rb4338a.overlay \
-            -DEXTRA_CONF_FILE=$(pwd)/tests/drivers/dma/chan_blen_transfer/boards/siwx917_rb4338a.conf \
-            -v --inline-logs
+          west twister -v --inline-logs \
+            -s drivers.dma.chan_blen_transfer \
+            -p siwx917_rb4338a \
+            -x DTC_OVERLAY_FILE=$(pwd)/tests/drivers/dma/chan_blen_transfer/boards/siwx917_rb4338a.overlay \
+            -x EXTRA_CONF_FILE=$(pwd)/tests/drivers/dma/chan_blen_transfer/boards/siwx917_rb4338a.conf
 
       - name: Build Bluetooth samples
         working-directory: zephyr-silabs
         shell: bash
         run: |
           west twister -v --inline-logs -K \
-            -p xg27_dk2602a \
-            -p siwx917_rb4338a \
             -s sample.bluetooth.peripheral_hr \
-            -s sample.bluetooth.observer
+            -s sample.bluetooth.observer \
+            -p xg27_dk2602a \
+            -p siwx917_rb4338a
 
       - name: Build Rail samples
         working-directory: zephyr-silabs
         shell: bash
         run: |
-          west twister -s sample.rail.simple_txrx -T samples -v --inline-logs
+          west twister -v --inline-logs \
+            -s sample.rail.simple_txrx -T samples
 
       - name: Build Wifi samples
         working-directory: zephyr-silabs
         shell: bash
         run: |
-          west twister -s sample.net.wifi -p siwx917_rb4338a -v --inline-logs -K
+          west twister -v --inline-logs -K \
+            -s sample.net.wifi \
+            -p siwx917_rb4338a
+          west twister -v --inline-logs -K \
+            -s sample.net.wifi \
+            -p siwx917_rb4338a \
+            -x EXTRA_CONF_FILE=$(pwd)/samples/net/wifi/shell/soc/siwx917_offloaded_sockets.conf
diff --git a/samples/net/wifi/shell/soc/siwx917_offloaded_sockets.conf b/samples/net/wifi/shell/soc/siwx917_offloaded_sockets.conf
new file mode 100644
index 0000000..4d2a10a
--- /dev/null
+++ b/samples/net/wifi/shell/soc/siwx917_offloaded_sockets.conf
@@ -0,0 +1 @@
+CONFIG_WIFI_SIWX917_NET_STACK_OFFLOAD=y