diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8c50e56690..b9efe89356 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -94,7 +94,7 @@ jobs:
         if: success() && ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/release-candidate' )
         env:
           GIT_SHA:
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: doxygen.zip-${{ github.sha }}
           path: ./freertos/doxygen.zip
@@ -144,7 +144,7 @@ jobs:
           Upload memory size report as artifact (for main and
           release-candidate ONLY)
         if: success() && ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/release-candidate' )
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: freertos-memory-estimates
           path: ./freertos_lts_memory_estimates.json
diff --git a/.github/workflows/kernel-unit-tests.yml b/.github/workflows/kernel-unit-tests.yml
index 46945c4eb6..7f189c0876 100644
--- a/.github/workflows/kernel-unit-tests.yml
+++ b/.github/workflows/kernel-unit-tests.yml
@@ -28,12 +28,12 @@ jobs:
           make -C FreeRTOS/Test/CMock lcovhtml
           lcov --config-file FreeRTOS/Test/CMock/lcovrc --summary FreeRTOS/Test/CMock/build/cmock_test.info > FreeRTOS/Test/CMock/build/cmock_test_summary.txt
     - name: Archive code coverage data
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: coverage-data
         path: FreeRTOS/Test/CMock/build/cmock_test*
     - name: Archive code coverage html report
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: coverage-report
         path: FreeRTOS/Test/CMock/build/coverage
@@ -69,12 +69,12 @@ jobs:
           make -C FreeRTOS/Test/CMock lcovhtml
           lcov --config-file FreeRTOS/Test/CMock/lcovrc --summary FreeRTOS/Test/CMock/build/cmock_test.info > FreeRTOS/Test/CMock/build/cmock_test_summary.txt
     - name: Archive code coverage data
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: coverage-data
         path: FreeRTOS/Test/CMock/build/cmock_test*
     - name: Archive code coverage html report
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: coverage-report
         path: FreeRTOS/Test/CMock/build/coverage
diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Echo_Qemu_mps2/Readme_UserNetworking.md b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Echo_Qemu_mps2/Readme_UserNetworking.md
index 52f9cf31ca..4c5104aa75 100644
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Echo_Qemu_mps2/Readme_UserNetworking.md
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_TCP_Echo_Qemu_mps2/Readme_UserNetworking.md
@@ -129,7 +129,7 @@ is running `sudo nc -l 7` or `netcat -l 7` or `nc -l -p 7` depending on your OS)
 
 2. Start QEMU in the paused state waiting for GDB connection:
 ```shell
-   sudo qemu-system-arm -machine mps2-an385 -cpu cortex-m3 \
+   sudo qemu-system-arm -machine mps2-an385 -cpu cortex-m3 -s -S \
    -kernel ./build/freertos_tcp_mps2_demo.axf \
    -monitor null -semihosting -semihosting-config enable=on,target=native -serial stdio -nographic \
    -netdev user,id=mynet0, -net nic,model=lan9118,netdev=mynet0 \