diff --git a/CODEOWNERS b/CODEOWNERS
index e047638d70e..2991bbce7e9 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -180,7 +180,6 @@
 /doc/nrf/libraries/networking/ot_rpc.rst  @nrfconnect/ncs-terahertz-doc @nrfconnect/ncs-protocols-serialization
 /doc/nrf/libraries/networking/rest_client.rst @nrfconnect/ncs-iot-positioning-doc
 /doc/nrf/libraries/networking/softap_wifi_provision.rst @nrfconnect/ncs-cia-doc
-/doc/nrf/libraries/networking/wifi_credentials.rst @nrfconnect/ncs-cia-doc
 /doc/nrf/libraries/networking/wifi_mgmt_ext.rst @nrfconnect/ncs-cia-doc
 /doc/nrf/libraries/networking/wifi_ready.rst @nrfconnect/ncs-wifi-doc
 /doc/nrf/libraries/nfc/                   @nrfconnect/ncs-si-muffin-doc
diff --git a/doc/nrf/libraries/networking/wifi_credentials.rst b/doc/nrf/libraries/networking/wifi_credentials.rst
deleted file mode 100644
index fedd413d1d5..00000000000
--- a/doc/nrf/libraries/networking/wifi_credentials.rst
+++ /dev/null
@@ -1,68 +0,0 @@
-.. _lib_wifi_credentials:
-
-Wi-Fi credentials
-#################
-
-.. contents::
-   :local:
-   :depth: 2
-
-The Wi-Fi credentials library provides means to load and store Wi-Fi® network credentials.
-
-Overview
-********
-
-This library uses either Zephyr's settings subsystem or Platform Security Architecture (PSA) Internal Trusted Storage (ITS) to store credentials.
-It also holds a list of SSIDs in RAM to provide dictionary-like access using SSIDs as keys.
-
-Configuration
-*************
-
-To use the Wi-Fi credentials library, enable the :kconfig:option:`CONFIG_WIFI_CREDENTIALS` Kconfig option.
-
-You can pick the backend using the following options:
-
-* :kconfig:option:`CONFIG_WIFI_CREDENTIALS_BACKEND_PSA` - Default option for non-secure targets, which includes a TF-M partition (non-minimal TF-M profile type).
-* :kconfig:option:`CONFIG_WIFI_CREDENTIALS_BACKEND_SETTINGS` - Default option for secure targets.
-
-To configure the maximum number of networks, use the :kconfig:option:`CONFIG_WIFI_CREDENTIALS_MAX_ENTRIES` Kconfig option.
-
-The IEEE 802.11 standard does not specify the maximum length of SAE passwords.
-To change the default, use the :kconfig:option:`CONFIG_WIFI_CREDENTIALS_SAE_PASSWORD_LENGTH` Kconfig option.
-
-When using the PSA ITS backend, entries will be saved under consecutive key IDs with an offset configured with the :kconfig:option:`CONFIG_WIFI_CREDENTIALS_BACKEND_PSA_OFFSET` Kconfig option.
-
-Adding credentials
-******************
-
-You can add credentials using the :c:func:`wifi_credentials_set_personal` and :c:func:`wifi_credentials_set_personal_struct` functions.
-The former will build the internally used struct from given fields, while the latter takes the struct directly.
-If you add credentials with the same SSID twice, the older entry will be overwritten.
-
-Querying credentials
-********************
-
-With an SSID, you can query credentials using the :c:func:`wifi_credentials_get_by_ssid_personal` and :c:func:`wifi_credentials_get_by_ssid_personal_struct` functions.
-
-You can iterate over all stored credentials with the :c:func:`wifi_credentials_for_each_ssid` function.
-Deleting or overwriting credentials while iterating is allowed, since these operations do not change internal indices.
-
-Removing credentials
-********************
-
-You can remove credentials using the :c:func:`wifi_credentials_delete_by_ssid` function.
-
-Limitations
-***********
-
-The library has the following limitations:
-
-* Although permitted by the IEEE 802.11 standard, this library does not support zero-length SSIDs.
-* Wi-Fi Protected Access (WPA) Enterprise credentials are not yet supported.
-* The number of networks stored is fixed compile time.
-
-API documentation
-*****************
-
-| Header file: :file:`include/zephyr/net/wifi_credentials.h`
-| Source files: :file:`subsys/net/lib/wifi_credentials`
diff --git a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst
index a7ac0b7e787..53a3ddf74fb 100644
--- a/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst
+++ b/doc/nrf/releases_and_maturity/releases/release-notes-changelog.rst
@@ -203,7 +203,7 @@ Thread
 Wi-Fi®
 ------
 
-|no_changes_yet_note|
+* Added support for EAP-PEAP and EAP-TTLS authentication methods to enterprise security in the Wi-Fi management API.
 
 Applications
 ============
@@ -932,5 +932,6 @@ Documentation
   * The :ref:`log_rpc` library documentation page.
   * The :ref:`mcuboot_serial_recovery` documentation page, based on the official Zephyr documentation, which discusses the implementation and usage of the serial recovery.
 
+* Moved the Wi-Fi credentials library page to the upstream :ref:`Zephyr repository <zephyr:lib_wifi_credentials>`.
 * Removed the Getting started with nRF7002 DK and Getting started with other DKs pages from the :ref:`gsg_guides` section.
   These pages were no longer relevant as the `Quick Start app`_ now also supports the nRF7002 DK.
diff --git a/west.yml b/west.yml
index 8b04c6e13aa..902cca1a020 100644
--- a/west.yml
+++ b/west.yml
@@ -65,7 +65,7 @@ manifest:
     # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
     - name: zephyr
       repo-path: sdk-zephyr
-      revision: 101cff9874cb0ce004e193ab7d842665cfa9b574
+      revision: 9b0cfccc78663cfbca113937473ce20d819367f0
       import:
         # In addition to the zephyr repository itself, NCS also
         # imports the contents of zephyr/west.yml at the above