diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index 9041bc7..342986d 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -14,7 +14,7 @@ jobs:
     container: ghcr.io/zephyrproject-rtos/ci:v0.26.2
     env:
       CMAKE_PREFIX_PATH: /opt/toolchains
-      ZEPHYR_VERSION: 3.6.0
+      ZEPHYR_VERSION: 3.7.0
       # Board to use with renode
       BOARD: nrf52840dk_nrf52840
     steps:
@@ -68,14 +68,13 @@ jobs:
       - name: Run tests on latest Renode
         uses: antmicro/renode-test-action@v3.0.0
         with:
-            renode-version: '1.13.3'
+            renode-version: '1.15.3'
             tests-to-run: 'tests/renode/uptime_test.robot'
             artifacts-path: ${{ github.workspace }}
 
 
       - name: Archive latest results
         uses: actions/upload-artifact@v4
-        if: failure()
         with:
             name: test-results-latest
             path: |
diff --git a/samples/uptime/prj.conf b/samples/uptime/prj.conf
index fea6d49..6783a7d 100644
--- a/samples/uptime/prj.conf
+++ b/samples/uptime/prj.conf
@@ -3,17 +3,13 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-
+CONFIG_CPP=y
+CONFIG_STD_CPP17=y
 CONFIG_BT=y
-CONFIG_BT_DEBUG_LOG=y
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_DEVICE_NAME="BLEUtils_Uptime"
-
-CONFIG_CPLUSPLUS=y
-CONFIG_LIB_CPLUSPLUS=y
-CONFIG_STD_CPP17=y
-CONFIG_NEWLIB_LIBC=y
 CONFIG_BLE_UTILS=y
 CONFIG_BT_ASSERT=n
 CONFIG_LOG=y
-CONFIG_BT_EXT_ADV=y
\ No newline at end of file
+CONFIG_BT_EXT_ADV=y
+CONFIG_BT_CTLR_ADV_DATA_LEN_MAX=100
\ No newline at end of file
diff --git a/tests/renode/ble_central/prj.conf b/tests/renode/ble_central/prj.conf
index 6203941..344bf0e 100644
--- a/tests/renode/ble_central/prj.conf
+++ b/tests/renode/ble_central/prj.conf
@@ -3,10 +3,9 @@
 #---------
 #C++
 #----------
-CONFIG_CPLUSPLUS=y
-CONFIG_LIB_CPLUSPLUS=y
+CONFIG_CPP=y
 CONFIG_STD_CPP17=y
-CONFIG_NEWLIB_LIBC=y
+CONFIG_REQUIRES_FULL_LIBCPP=y
 CONFIG_UART_CONSOLE=y
 CONFIG_BLE_UTILS=y
 CONFIG_CBPRINTF_FP_SUPPORT=y