diff --git a/.github/workflows/docbuild.yml b/.github/workflows/docbuild.yml
index 67e5d2b87b..35bed10385 100644
--- a/.github/workflows/docbuild.yml
+++ b/.github/workflows/docbuild.yml
@@ -30,8 +30,13 @@ jobs:
       group: ${{ github.workflow }}-${{ github.ref }}
       cancel-in-progress: true
     steps:
-      - name: Checkout sources
-        uses: nordicbuilder/action-checkout-west-update@main
+    #  - name: Checkout sources
+    #    uses: nordicbuilder/action-checkout-west-update@main
+      - name: Checkout the code
+        uses: actions/checkout@v3
+        with:
+          path: ncs/nrf
+          fetch-depth: 0
 
       - name: cache-pip
         uses: actions/cache@v3
diff --git a/CODEOWNERS b/CODEOWNERS
index 9c50326777..372473bcd6 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -4,345 +4,27 @@
 # Order is important; the last matching pattern takes the most
 # precedence.
 
+* @carlescufi
+
 # Root folder
-/VERSION                                  @carlescufi @tejlmand
-/ncs_version.h.in                         @carlescufi @tejlmand
-/CODEOWNERS                               @carlescufi
-/LICENSE                                  @carlescufi
+/VERSION                                  @rlubos
+/ncs_version.h.in                         @carlescufi
+/LICENSE                                  @jukkar
 /README.rst                               @carlescufi
-/Jenkinsfile                              @thst-nordic
-/west.yml                                 @carlescufi @tejlmand
-/west-test.yml                            @thst-nordic
+/west.yml                                 @rlubos
+
 
-# CI specific west
-/test-manifests/99-default-test-nrf.yml     @thst-nordic
+# Invividual folders
+drivers/**				  @nrfconnect/ncs-co-drivers
+drivers/entropy/**			  @nrfconnect/ncs-co-usb @nordic-ncs @jukkar
+doc/					  @jukkar
+zephyr/                                   @carlescufi
 
-# Github Actions
-/.github/                                 @nrfconnect/ncs-ci
-/.github/test-spec.yml                    @nrfconnect/ncs-test-leads
+# Global overrides
+*.rst                                     @gmarull
+CMakeLists.txt				  @nrfconnect/ncs-co-build-system
+**/bindings/				  @jukkar
+/cmake/					  @tejlmand
 
-# Quarantine for the CI and Twister
-/scripts/quarantine.yaml                  @nrfconnect/ncs-test-leads
 
-# VS Code Configuration files
-/.vscode/                                 @trond-snekvik
 
-# Applications
-/applications/asset_tracker_v2/           @nrfconnect/ncs-cia @coderbyheart
-/applications/connectivity_bridge/        @nrfconnect/ncs-cia @nordic-auko
-/applications/ipc_radio/                  @dchat-nordic
-/applications/machine_learning/           @pdunaj
-/applications/matter_bridge/              @Damian-Nordic @kkasperczyk-no
-/applications/matter_weather_station/     @Damian-Nordic @kkasperczyk-no
-/applications/nrf_desktop/                @MarekPieta
-/applications/nrf5340_audio/              @nrfconnect/ncs-audio
-/applications/serial_lte_modem/           @SeppoTakalo @MarkusLassila @rlubos @tomi-font
-/applications/zigbee_weather_station/     @milewr
-# Boards
-/boards/                                  @anangl
-# All cmake related files
-/cmake/                                   @tejlmand
-/CMakeLists.txt                           @tejlmand
-# All Kconfig related files
-Kconfig*                                  @tejlmand
-# Sysbuild related files
-/sysbuild/                                @tejlmand @nordicjm
-/cmake/sysbuild/                          @tejlmand @nordicjm
-# All doc related files
-/doc/_extensions/                         @gmarull
-/doc/_scripts/                            @carlescufi
-/doc/_static/                             @carlescufi
-/doc/_utils/                              @gmarull
-/doc/cache.yml                            @gmarull
-/doc/CMakeLists.txt                       @carlescufi
-/doc/**/conf.py                           @carlescufi
-/doc/kconfig/                             @gmarull
-/doc/nrf/                                 @carlescufi
-/doc/nrf/device_guides/working_with_nrf/nrf54h/  @FrancescoSer
-/doc/nrf/device_guides/working_with_nrf/nrf54l/ @annwoj
-/doc/nrfx/                                @gmarull
-/doc/matter/                              @gmarull
-/doc/mcuboot/                             @carlescufi
-/doc/nrfxlib/                             @gmarull
-/doc/versions.json                        @carlescufi
-/doc/custom.properties                    @gmarull
-/doc/tags.yml                             @gmarull @umapraseeda @b-gent
-/doc/requirements.txt                     @gmarull
-# General top-level docs
-/doc/nrf/config_and_build/                @greg-fer
-/doc/nrf/installation/                    @greg-fer
-/doc/nrf/security/                        @greg-fer
-/doc/nrf/test_and_optimize/               @greg-fer
-/doc/nrf/*.rst                            @greg-fer
-# Protocols related docs
-/doc/nrf/protocols/thread/*.rst           @wiba-nordic
-# All subfolders
-/drivers/                                 @anangl
-/drivers/serial/                          @nordic-krch @anangl
-/drivers/sensor/bh1749/                   @nrfconnect/ncs-cia
-/drivers/sensor/bme68x_iaq/               @nrfconnect/ncs-cia
-/drivers/sensor/paw3212/                  @anangl @pdunaj @MarekPieta
-/drivers/sensor/pmw3360/                  @anangl @pdunaj @MarekPieta
-/drivers/wifi/nrf700x/                    @krish2718 @sachinthegreen @rado17 @rlubos
-/dts/                                     @anangl
-/ext/                                     @carlescufi
-/include/                                 @anangl @rlubos
-/include/net/azure_*                      @nrfconnect/ncs-cia @coderbyheart
-/include/net/wifi_credentials.h           @nrfconnect/ncs-cia
-/include/net/nrf_cloud_*                  @plskeggs @jayteemo @glarsennordic
-/include/bluetooth/                       @alwa-nordic @jori-nordic @KAGA164
-/include/bluetooth/services/fast_pair/    @alstrzebonski @MarekPieta @kapi-no
-/include/bluetooth/adv_prov.h             @MarekPieta @kapi-no @KAGA164
-/include/bluetooth/mesh/                  @ludvigsj
-/include/caf/                             @pdunaj
-/include/debug/ppi_trace.h                @nordic-krch @anangl
-/include/drivers/                         @anangl
-/include/mpsl/                            @nrfconnect/ncs-dragoon
-/include/net/                             @rlubos
-/include/nfc/                             @anangl @grochu
-/include/sdfw_services/                   @anhmolt @hakonfam @jonathannilsen
-/include/shell/                           @nordic-krch
-/lib/bin/                                 @rlubos @lemrey
-/lib/adp536x/                             @nrfconnect/ncs-cia
-/lib/at_cmd_parser/                       @rlubos
-/lib/at_cmd_custom/                       @eivindj-nordic
-/lib/at_host/                             @rlubos
-/lib/at_monitor/                          @lemrey @rlubos
-/lib/at_shell/                            @nrfconnect/ncs-cia
-/lib/gcf_sms/                             @eivindj-nordic
-/lib/nrf_modem_lib/                       @rlubos @lemrey
-/lib/edge_impulse/                        @pdunaj
-/lib/fem_al/                              @KAGA164
-/lib/fprotect/                            @hakonfam
-/lib/flash_patch/                         @hakonfam
-/lib/location/                            @trantanen @jhirsi @tokangas
-/lib/lte_link_control/                    @tokangas @trantanen @jhirsi
-/lib/modem_antenna/                       @tokangas
-/lib/modem_battery/                       @MirkoCovizzi
-/lib/modem_info/                          @rlubos
-/lib/modem_key_mgmt/                      @rlubos
-/lib/multithreading_lock/                 @nrfconnect/ncs-dragoon
-/lib/pdn/                                 @lemrey @rlubos
-/lib/ram_pwrdn/                           @mariuszpos @MarekPorwisz
-/lib/fatal_error/                         @KAGA164 @nordic-krch
-/lib/sfloat/                              @kapi-no @maje-emb
-/lib/sms/                                 @trantanen @tokangas
-/lib/st25r3911b/                          @grochu
-/lib/supl/                                @rlubos @tokangas
-/lib/date_time/                           @trantanen @tokangas
-/lib/hw_id/                               @nrfconnect/ncs-cia
-/lib/wave_gen/                            @MarekPieta
-/lib/hw_unique_key/                       @frkv @Vge0rge @vili-nordic @SebastianBoe @mswarowsky
-/lib/identity_key/                        @frkv @Vge0rge @vili-nordic @SebastianBoe @mswarowsky
-/lib/modem_jwt/                           @jayteemo @SeppoTakalo
-/lib/modem_slm/                           @SeppoTakalo @MarkusLassila @tomi-font
-/lib/modem_attest_token/                  @jayteemo
-/lib/qos/                                 @nrfconnect/ncs-cia
-/lib/contin_array/                        @nrfconnect/ncs-audio
-/lib/data_fifo/                           @nrfconnect/ncs-audio
-/lib/pcm_mix/                             @nrfconnect/ncs-audio
-/lib/pcm_stream_channel_modifier/         @nrfconnect/ncs-audio
-/lib/sample_rate_converter/               @andvib @gWacey
-/lib/tone/                                @nrfconnect/ncs-audio
-/modules/                                 @tejlmand
-/modules/hostap/                          @krish2718 @jukkar @rado17 @sachinthegreen @rlubos
-/modules/mcuboot/                         @de-nordic @nordicjm
-/modules/cjson/                           @nrfconnect/ncs-cia @plskeggs @sigvartmh
-/modules/trusted-firmware-m/              @frkv @Vge0rge @vili-nordic @SebastianBoe @mswarowsky
-/modules/coremark/                        @zycz
-/samples/                                 @nrfconnect/ncs-test-leads
-/samples/net/                             @nrfconnect/ncs-cia @lemrey
-/samples/sensor/bh1749/                   @nrfconnect/ncs-cia
-/samples/sensor/bme68x_iaq/               @nrfconnect/ncs-cia
-/samples/bluetooth/                       @alwa-nordic @jori-nordic @carlescufi @KAGA164
-/samples/bluetooth/mesh/                  @ludvigsj
-/samples/bluetooth/direction_finding_connectionless_rx/ @ppryga-nordic
-/samples/bluetooth/direction_finding_connectionless_tx/ @ppryga-nordic
-/samples/bluetooth/fast_pair/             @alstrzebonski @MarekPieta @kapi-no
-/samples/bootloader/                      @hakonfam @oyvindronningstad
-/samples/matter/                          @Damian-Nordic @kkasperczyk-no
-/samples/crypto/                          @frkv @Vge0rge @vili-nordic @SebastianBoe @mswarowsky
-/samples/debug/memfault/                  @nrfconnect/ncs-cia
-/samples/debug/ppi_trace/                 @nordic-krch @anangl
-/samples/hw_id/                           @nrfconnect/ncs-cia
-/samples/edge_impulse/                    @pdunaj
-/samples/esb/                             @lemrey
-/samples/app_event_manager/               @pdunaj @MarekPieta
-/samples/event_manager_proxy/             @rakons
-/samples/gazell/                          @leewkb4567
-/samples/keys/                            @frkv @Vge0rge @vili-nordic @SebastianBoe @mswarowsky
-/samples/mpsl/                            @nrfconnect/ncs-dragoon
-/samples/nfc/                             @grochu
-/samples/nrf_rpc/                         @doki-nordic @KAGA164
-/samples/nrf5340/empty_app_core/          @doki-nordic
-/samples/cellular/                        @rlubos @lemrey
-/samples/cellular/battery/                @MirkoCovizzi
-/samples/cellular/location/               @trantanen @jhirsi @tokangas
-/samples/cellular/lwm2m_client/           @rlubos @SeppoTakalo @juhaylinen
-/samples/cellular/modem_shell/            @trantanen @jhirsi @tokangas
-/samples/cellular/nidd/                   @stig-bjorlykke
-/samples/cellular/nrf_cloud_*             @plskeggs @jayteemo @glarsennordic
-/samples/cellular/nrf_provisioning/       @SeppoTakalo @juhaylinen
-/samples/cellular/modem_trace_flash/      @eivindj-nordic
-/samples/cellular/slm_shell/              @MarkusLassila @tomi-font
-/samples/cellular/sms/                    @trantanen @tokangas
-/samples/openthread/                      @rlubos @edmont @canisLupus1313 @maciejbaczmanski
-/samples/nrf_profiler/                    @pdunaj
-/samples/peripheral/radio_test/           @KAGA164 @maje-emb
-/samples/peripheral/lpuart/               @nordic-krch
-/samples/peripheral/802154_phy_test/      @ankuns @jciupis @ahasztag
-/samples/peripheral/802154_sniffer/       @e-rk
-/samples/tfm/                             @frkv @Vge0rge @vili-nordic @SebastianBoe @mswarowsky
-/samples/zigbee/                          @milewr
-/samples/CMakeLists.txt                   @tejlmand
-/samples/nrf5340/netboot/                 @hakonfam
-/samples/nrf5340/multiprotocol_rpmsg/     @hubertmis
-/samples/sdfw/                            @hakonfam @jonathannilsen
-/samples/sdfw/ssf_client/                 @anhmolt
-/samples/wifi/provisioning/               @wentong-li @bama-nordic
-/samples/wifi/radio_test/                 @bama-nordic @sachinthegreen
-/samples/wifi/scan/                       @D-Triveni @bama-nordic
-/samples/wifi/shell/                      @krish2718 @sachinthegreen @rado17 @rlubos
-/samples/wifi/sta/                        @D-Triveni @bama-nordic
-/samples/wifi/ble_coex/                   @muraliThokala @bama-nordic
-/samples/wifi/shutdown/                   @krish2718 @sachinthegreen
-/samples/wifi/twt/                        @chiranjeevi2776 @krish2718
-/samples/wifi/throughput/                 @SusanGRapaka @D-Triveni
-/samples/wifi/raw_tx_packet/              @D-Triveni
-/samples/wifi/softap/                     @D-Triveni @krish2718
-/samples/wifi/monitor/                    @chiranjeevi2776 @krish2718
-/samples/benchmarks/coremark/             @zycz
-/scripts/                                 @tejlmand @nrfconnect/ncs-test-leads
-/scripts/hid_configurator/                @MarekPieta
-/scripts/tools-versions-*.txt             @tejlmand @grho @shanthanordic @ihansse
-/scripts/requirements-*.txt               @tejlmand @grho @shanthanordic @ihansse
-/scripts/west_commands/sbom/              @doki-nordic @maje-emb
-/scripts/bootloader/                      @hakonfam @sigvartmh
-/scripts/ncs-docker-version.txt           @nrfconnect/ncs-ci
-/scripts/print_docker_image.sh            @nrfconnect/ncs-ci
-/scripts/print_toolchain_checksum.sh      @nrfconnect/ncs-ci
-/share/zephyrbuild-package/               @tejlmand
-/share/ncs-package/                       @tejlmand
-/snippets/nrf91-modem-trace-ext-flash/    @nrfconnect/ncs-cia
-/snippets/nrf91-modem-trace-uart/         @eivindj-nordic
-/snippets/tfm-enable-share-uart/          @nrfconnect/ncs-cia
-/snippets/nrf70-debug/                    @krish2718 @sachinthegreen
-/snippets/nrf70-fw-patch-ext-flash/       @krish2718 @sachinthegreen
-/subsys/audio_module/                     @nrfconnect/ncs-audio
-/subsys/bluetooth/                        @alwa-nordic @jori-nordic @carlescufi @KAGA164
-/subsys/bluetooth/mesh/                   @ludvigsj
-/subsys/bluetooth/controller/             @nrfconnect/ncs-dragoon
-/subsys/bluetooth/adv_prov/               @MarekPieta @kapi-no @KAGA164
-/subsys/bluetooth/services/fast_pair/     @alstrzebonski @MarekPieta @kapi-no
-/subsys/bluetooth/services/wifi_prov/     @wentong-li @bama-nordic
-/subsys/bootloader/                       @hakonfam @sigvartmh
-/subsys/caf/                              @pdunaj
-/subsys/debug/                            @nordic-krch @anangl
-/subsys/dfu/                              @hakonfam @sigvartmh
-/subsys/dfu/dfu_multi_image/              @Damian-Nordic
-/subsys/dm/                               @maje-emb
-/subsys/ieee802154/                       @rlubos @ankuns @jciupis @ahasztag
-/subsys/mgmt/                             @hakonfam @sigvartmh
-/subsys/emds/                             @balaklaka
-/subsys/esb/                              @lemrey
-/subsys/app_event_manager/                @pdunaj
-/subsys/app_event_manager_profiler_tracer/    @pdunaj @MarekPieta
-/subsys/event_manager_proxy/              @rakons
-/subsys/fw_info/                          @hakonfam
-/subsys/gazell/                           @leewkb4567
-/subsys/mpsl/                             @nrfconnect/ncs-dragoon
-/subsys/mpsl/cx/                          @jciupis @martintv
-/subsys/mpsl/fem/                         @jciupis @martintv
-/subsys/net/                              @rlubos
-/subsys/net/lib/mqtt_helper/              @nrfconnect/ncs-cia
-/subsys/net/lib/azure_*                   @nrfconnect/ncs-cia @coderbyheart
-/subsys/net/lib/aws_*                     @nrfconnect/ncs-cia @coderbyheart
-/subsys/net/lib/ftp_client/               @MarkusLassila @tomi-font
-/subsys/net/lib/icalendar_parser/         @lats1980
-/subsys/net/lib/lwm2m_client_utils/       @rlubos @SeppoTakalo @juhaylinen
-/subsys/net/lib/nrf_cloud/                @plskeggs @jayteemo @glarsennordic
-/subsys/net/lib/nrf_provisioning/         @SeppoTakalo @juhaylinen
-/subsys/net/lib/zzhc/                     @junqingzou
-/subsys/net/lib/wifi_credentials/         @nrfconnect/ncs-cia
-/subsys/net/openthread/                   @rlubos @edmont @canisLupus1313 @maciejbaczmanski
-/subsys/nfc/                              @grochu @anangl
-/subsys/nrf_rpc/                          @doki-nordic @KAGA164
-/subsys/partition_manager/                @hakonfam
-/subsys/pcd/                              @hakonfam
-/subsys/nrf_profiler/                     @pdunaj
-/subsys/shell/                            @nordic-krch
-/subsys/sdfw_services/                    @anhmolt @hakonfam @jonathannilsen
-/subsys/suit/                             @tomchy
-/subsys/nrf_security/                     @frkv @Vge0rge @vili-nordic @SebastianBoe @mswarowsky
-/subsys/trusted_storage/                  @frkv @Vge0rge @vili-nordic @SebastianBoe @mswarowsky
-/subsys/uart_async_adapter/               @rakons
-/subsys/net_core_monitor/                 @maje-emb
-/subsys/zigbee/                           @milewr
-/tests/                                   @PerMac @katgiadla
-/tests/bluetooth/tester/                  @carlescufi @ludvigsj
-/tests/bluetooth/iso/                     @nrfconnect/ncs-audio @Frodevan
-/tests/crypto/                            @stephen-nordic @magnev
-/tests/drivers/flash_patch/               @oyvindronningstad
-/tests/drivers/fprotect/                  @oyvindronningstad
-/tests/drivers/lpuart/                    @nordic-krch
-/tests/drivers/nrfx_integration_test/     @anangl
-/tests/lib/at_cmd_parser/                 @rlubos
-/tests/lib/at_cmd_custom/                 @eivindj-nordic
-/tests/lib/date_time/                     @trantanen @tokangas
-/tests/lib/edge_impulse/                  @pdunaj @MarekPieta
-/tests/lib/nrf_fuel_gauge/                @nordic-auko @aasinclair
-/tests/lib/gcf_sms/                       @eivindj-nordic
-/tests/lib/hw_unique_key*/                @frkv @Vge0rge @vili-nordic @SebastianBoe @mswarowsky
-/tests/lib/hw_id/                         @nrfconnect/ncs-cia
-/tests/lib/location/                      @trantanen @tokangas
-/tests/lib/lte_lc/                        @trantanen @tokangas
-/tests/lib/lte_lc_api/                    @trantanen @tokangas
-/tests/lib/modem_jwt/                     @SeppoTakalo
-/tests/lib/modem_battery/                 @MirkoCovizzi
-/tests/lib/modem_info/                    @nrfconnect/ncs-cia
-/tests/lib/qos/                           @nrfconnect/ncs-cia
-/tests/lib/sfloat/                        @kapi-no @maje-emb
-/tests/lib/sms/                           @trantanen @tokangas
-/tests/lib/nrf_modem_lib/                 @lemrey @MirkoCovizzi
-/tests/lib/nrf_modem_lib/nrf91_sockets/   @MirkoCovizzi
-/tests/lib/pdn/                           @lemrey @eivindj-nordic
-/tests/lib/ram_pwrdn/                     @Damian-Nordic
-/tests/lib/contin_array/                  @nrfconnect/ncs-audio
-/tests/lib/data_fifo/                     @nrfconnect/ncs-audio
-/tests/lib/pcm_mix/                       @nrfconnect/ncs-audio
-/tests/lib/pcm_stream_channel_modifier/   @nrfconnect/ncs-audio
-/tests/lib/sample_rate_converter/         @andvib @gWacey
-/tests/lib/tone/                          @nrfconnect/ncs-audio
-/tests/modules/lib/zcbor/                 @oyvindronningstad
-/tests/modules/mcuboot/direct_xip/        @hakonfam
-/tests/modules/mcuboot/external_flash/    @hakonfam @sigvartmh
-/tests/nrf5340_audio/                     @nrfconnect/ncs-audio @nordic-auko
-/tests/subsys/audio_module/               @nrfconnect/ncs-audio
-/tests/subsys/bluetooth/gatt_dm/          @doki-nordic
-/tests/subsys/bluetooth/mesh/             @ludvigsj
-/tests/subsys/bluetooth/fast_pair/        @alstrzebonski @MarekPieta @kapi-no
-/tests/subsys/bootloader/                 @hakonfam
-/tests/subsys/caf/                        @zycz
-/tests/subsys/debug/cpu_load/             @nordic-krch
-/tests/subsys/dfu/                        @hakonfam @sigvartmh
-/tests/subsys/dfu/dfu_multi_image/        @Damian-Nordic
-/tests/subsys/emds/                       @balaklaka
-/tests/subsys/event_manager_proxy/        @rakons
-/tests/subsys/app_event_manager/          @pdunaj @MarekPieta @rakons
-/tests/subsys/fw_info/                    @oyvindronningstad
-/tests/subsys/net/lib/aws_*/              @nrfconnect/ncs-cia
-/tests/subsys/net/lib/azure_iot_hub/      @nrfconnect/ncs-cia
-/tests/subsys/net/lib/fota_download/      @hakonfam @sigvartmh
-/tests/subsys/net/lib/lwm2m_*/            @SeppoTakalo @juhaylinen
-/tests/subsys/net/lib/nrf_cloud/          @tony-le-24
-/tests/subsys/net/lib/nrf_provisioning/   @SeppoTakalo @juhaylinen
-/tests/subsys/net/lib/wifi_credentials*/  @nrfconnect/ncs-cia
-/tests/subsys/net/lib/mqtt_helper/        @nrfconnect/ncs-cia
-/tests/subsys/partition_manager/region/   @hakonfam @sigvartmh
-/tests/subsys/pcd/                        @hakonfam @sigvartmh
-/tests/subsys/nrf_profiler/               @pdunaj @MarekPieta
-/tests/subsys/sdfw_services/              @anhmolt @hakonfam @jonathannilsen
-/tests/subsys/zigbee/                     @milewr
-/tests/tfm/                               @frkv @Vge0rge @vili-nordic @SebastianBoe @mswarowsky @stephen-nordic @magnev
-/tests/unity/                             @nordic-krch
-/zephyr/                                  @carlescufi
diff --git a/west.yml b/west.yml
index e2a6aa3fb7..adb28088c2 100644
--- a/west.yml
+++ b/west.yml
@@ -148,7 +148,7 @@ manifest:
     - name: nrfxlib
       repo-path: sdk-nrfxlib
       path: nrfxlib
-      revision: 4fab886b4f02fe92c41097ed410435c4fc04fa06
+      revision: pull/71/head
     - name: trusted-firmware-m
       repo-path: sdk-trusted-firmware-m
       path: modules/tee/tf-m/trusted-firmware-m