diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 39d753f7..1fc71cf6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -216,7 +216,7 @@ jobs:
       - name: Build nrf53 firmware
         working-directory: nrf/applications/connectivity_bridge
         run: |
-          west build -b thingy91x/nrf5340/cpuapp -p --sysbuild -- -Dmcuboot_CONFIG_FW_INFO_FIRMWARE_VERSION=3 -DCONFIG_BUILD_S1_VARIANT=y
+          west build -b thingy91x/nrf5340/cpuapp -p --sysbuild -- -Dmcuboot_CONFIG_FW_INFO_FIRMWARE_VERSION=3
 
       - name: Create partition manager report for nRF53 firmware
         working-directory: nrf/applications/connectivity_bridge/build
@@ -272,7 +272,7 @@ jobs:
           cp twister-out/thingy91x_nrf9151_ns/app/app.build.bootloader_update/dfu_mcuboot.zip \
             hello.nrfcloud.com-${{ env.VERSION }}-thingy91x-nrf91-bootloader.zip
           rm -rf twister-out
-          west build -b thingy91x/nrf5340/cpuapp -p --sysbuild -d ../nrf/applications/connectivity_bridge/build-bl-update ../nrf/applications/connectivity_bridge -- -Dmcuboot_CONFIG_FW_INFO_FIRMWARE_VERSION=4 -DCONFIG_BUILD_S1_VARIANT=y
+          west build -b thingy91x/nrf5340/cpuapp -p --sysbuild -d ../nrf/applications/connectivity_bridge/build-bl-update ../nrf/applications/connectivity_bridge -- -Dmcuboot_CONFIG_FW_INFO_FIRMWARE_VERSION=4
           cp ../nrf/applications/connectivity_bridge/build-bl-update/dfu_mcuboot.zip \
             connectivity-bridge-${{ env.VERSION }}-thingy91x-nrf53-bootloader.zip
 
diff --git a/app/prj.conf b/app/prj.conf
index 9373e351..e47e3c40 100644
--- a/app/prj.conf
+++ b/app/prj.conf
@@ -102,13 +102,6 @@ CONFIG_SETTINGS=y
 CONFIG_SETTINGS_FCB=y
 CONFIG_FCB=y
 
-# Download Client - used by FOTA and PGPS
-CONFIG_DOWNLOAD_CLIENT=y
-CONFIG_DOWNLOAD_CLIENT_HTTP_FRAG_SIZE_1024=y
-CONFIG_DOWNLOAD_CLIENT_STACK_SIZE=3072
-CONFIG_DOWNLOAD_CLIENT_BUF_SIZE=2048
-CONFIG_DOWNLOAD_CLIENT_MAX_HOSTNAME_SIZE=128
-
 # Flash - Used by FOTA and PGPS
 CONFIG_FLASH=y
 CONFIG_FLASH_PAGE_LAYOUT=y
@@ -121,12 +114,10 @@ CONFIG_NRF_CLOUD_FOTA_POLL=y
 CONFIG_NRF_CLOUD_FOTA_POLL_LOG_LEVEL_DBG=y
 CONFIG_NRF_CLOUD_FOTA_FULL_MODEM_UPDATE=y
 CONFIG_NRF_CLOUD_FOTA_DOWNLOAD_FRAGMENT_SIZE=1700
-CONFIG_NRF_CLOUD_COAP_DOWNLOADS=n
 CONFIG_FOTA_DOWNLOAD=y
 CONFIG_FOTA_DOWNLOAD_PROGRESS_EVT=y
 CONFIG_FOTA_DL_TIMEOUT_MIN=30
 CONFIG_DFU_TARGET=y
-CONFIG_BUILD_S1_VARIANT=y
 # COAP client
 CONFIG_COAP_CLIENT_THREAD_PRIORITY=0
 CONFIG_COAP_CLIENT_BLOCK_SIZE=1024
@@ -266,3 +257,9 @@ CONFIG_NRF_MODEM_LIB_TRACE_STACK_SIZE=1024
 CONFIG_NRF_MODEM_LIB_TRACE_FLASH_SECTORS=255
 # Modem trace flash partition size with 255 sectors of 4KB each
 CONFIG_NRF_MODEM_LIB_TRACE_BACKEND_FLASH_PARTITION_SIZE=0xFF000
+
+CONFIG_NRF_CLOUD_COAP_DOWNLOADS=y
+CONFIG_NRF_CLOUD_FOTA_POLL=y
+CONFIG_DOWNLOADER=y
+
+CONFIG_DOWNLOADER_STACK_SIZE=4096
diff --git a/app/sample.yaml b/app/sample.yaml
index 4bdeb726..dc26df93 100644
--- a/app/sample.yaml
+++ b/app/sample.yaml
@@ -30,4 +30,3 @@ tests:
     tags: ci_build
     extra_args:
       - mcuboot_CONFIG_FW_INFO_FIRMWARE_VERSION=3
-      - CONFIG_BUILD_S1_VARIANT=y
diff --git a/tests/on_target/tests/test_functional/test_fota.py b/tests/on_target/tests/test_functional/test_fota.py
index 68ebb7d2..abf1d4f5 100644
--- a/tests/on_target/tests/test_functional/test_fota.py
+++ b/tests/on_target/tests/test_functional/test_fota.py
@@ -59,8 +59,8 @@ def _run_fota(bundleId, fota_type, fotatimeout=APP_FOTA_TIMEOUT, test_fota_resum
 
         post_job(t91x_fota, bundleId, fota_type)
 
-        # if test_fota_resumption:
-        #     run_fota_resumption(t91x_fota, fota_type)
+        if test_fota_resumption:
+            run_fota_resumption(t91x_fota, fota_type)
 
         t91x_fota.uart.flush()
         t91x_fota.uart.wait_for_str("FOTA download finished", timeout=fotatimeout)
diff --git a/west.yml b/west.yml
index bd6f3c23..60c1f88b 100644
--- a/west.yml
+++ b/west.yml
@@ -14,5 +14,5 @@ manifest:
     - name: nrf
       remote: ncs
       repo-path: sdk-nrf
-      revision: v2.8.0-rc2
+      revision: pull/19908/head
       import: true