diff --git a/boards/altr/max10/doc/index.rst b/boards/altr/max10/doc/index.rst
index ca66d77a0a7..6a35d05b009 100644
--- a/boards/altr/max10/doc/index.rst
+++ b/boards/altr/max10/doc/index.rst
@@ -172,7 +172,7 @@ directly into RAM and then boot it from the __start symbol.
 In order for this to work, your entire kernel must be located in RAM. Make sure
 the following config options are disabled:
 
-.. code-block:: console
+.. code-block:: cfg
 
    CONFIG_XIP=n
    CONFIG_INCLUDE_RESET_VECTOR=n
@@ -265,7 +265,7 @@ In order for this to work, execute-in-place must be disabled, since the GDB
 'load' command can only put text and data in RAM. Ensure this is in your
 configuration:
 
-.. code-block:: console
+.. code-block:: cfg
 
    CONFIG_XIP=n
 
diff --git a/boards/phytec/mimx8mp_phyboard_pollux/doc/index.rst b/boards/phytec/mimx8mp_phyboard_pollux/doc/index.rst
index 965a1f9f912..46112485d6e 100644
--- a/boards/phytec/mimx8mp_phyboard_pollux/doc/index.rst
+++ b/boards/phytec/mimx8mp_phyboard_pollux/doc/index.rst
@@ -178,7 +178,7 @@ change it to
 In your prj.conf overwrite the configuration like this for the **DDR** memory
 region:
 
-.. code-block:: console
+.. code-block:: cfg
 
    CONFIG_CODE_DDR=y
    CONFIG_CODE_ITCM=n
diff --git a/doc/connectivity/networking/qemu_user_setup.rst b/doc/connectivity/networking/qemu_user_setup.rst
index 51bf4c78844..831b3952668 100644
--- a/doc/connectivity/networking/qemu_user_setup.rst
+++ b/doc/connectivity/networking/qemu_user_setup.rst
@@ -33,7 +33,7 @@ Using SLIRP with Zephyr
 In order to use SLIRP with Zephyr, the user has to set the Kconfig option to
 enable User Networking.
 
-.. code-block:: console
+.. code-block:: cfg
 
    CONFIG_NET_QEMU_USER=y
 
@@ -58,7 +58,7 @@ offloads this to the user, and expects that they will provide arguments
 based on requirements. For this, there is a Kconfig string which can be
 populated by the user.
 
-.. code-block:: console
+.. code-block:: cfg
 
    CONFIG_NET_QEMU_USER_EXTRA_ARGS="net=192.168.0.0/24,hostfwd=tcp::8080-:8080"
 
diff --git a/doc/develop/application/index.rst b/doc/develop/application/index.rst
index b84773659ff..eb4e2acb466 100644
--- a/doc/develop/application/index.rst
+++ b/doc/develop/application/index.rst
@@ -639,7 +639,7 @@ Application configuration options are usually set in :file:`prj.conf` in the
 application directory. For example, C++ support could be enabled with this
 assignment:
 
-.. code-block:: none
+.. code-block:: cfg
 
    CONFIG_CPP=y
 
@@ -666,7 +666,7 @@ marked ``[EXPERIMENTAL]`` in their Kconfig title.
 The :kconfig:option:`CONFIG_WARN_EXPERIMENTAL` setting can be used to enable warnings
 at CMake configure time if any experimental feature is enabled.
 
-.. code-block:: none
+.. code-block:: cfg
 
    CONFIG_WARN_EXPERIMENTAL=y
 
diff --git a/doc/develop/flash_debug/nordic_segger.rst b/doc/develop/flash_debug/nordic_segger.rst
index 92e2c31d5fc..083601f91aa 100644
--- a/doc/develop/flash_debug/nordic_segger.rst
+++ b/doc/develop/flash_debug/nordic_segger.rst
@@ -160,7 +160,7 @@ which can be very useful if the UART (through USB CDC ACM) is already being used
 a purpose different than logging (such as HCI traffic in the hci_uart application).
 To use RTT, you will first need to enable it by adding the following lines in your ``.conf`` file:
 
-.. code-block:: text
+.. code-block:: cfg
 
    CONFIG_USE_SEGGER_RTT=y
    CONFIG_RTT_CONSOLE=y
@@ -178,7 +178,7 @@ with the RTT one if they are enabled by default in the particular sample or
 application you are running. For example, to disable the UART console,
 add this to your ``.conf`` file:
 
-.. code-block:: console
+.. code-block:: cfg
 
    CONFIG_UART_CONSOLE=n
 
diff --git a/samples/bluetooth/hci_uart/README.rst b/samples/bluetooth/hci_uart/README.rst
index 84fc1208099..955a443a995 100644
--- a/samples/bluetooth/hci_uart/README.rst
+++ b/samples/bluetooth/hci_uart/README.rst
@@ -173,7 +173,7 @@ so:
 On the host application, some config options need to be used to select the H4
 driver instead of the built-in controller:
 
-.. code-block:: kconfig
+.. code-block:: cfg
 
    CONFIG_BT_HCI=y
    CONFIG_BT_CTLR=n
diff --git a/samples/bluetooth/hci_uart_3wire/README.rst b/samples/bluetooth/hci_uart_3wire/README.rst
index 43e9ea0c6d9..cabd79616be 100644
--- a/samples/bluetooth/hci_uart_3wire/README.rst
+++ b/samples/bluetooth/hci_uart_3wire/README.rst
@@ -173,7 +173,7 @@ so:
 On the host application, some config options need to be used to select the H5
 driver instead of the built-in controller:
 
-.. code-block:: kconfig
+.. code-block:: cfg
 
    CONFIG_BT_HCI=y
    CONFIG_BT_CTLR=n
diff --git a/samples/bluetooth/hci_uart_async/README.rst b/samples/bluetooth/hci_uart_async/README.rst
index 065231e926c..473d3437d05 100644
--- a/samples/bluetooth/hci_uart_async/README.rst
+++ b/samples/bluetooth/hci_uart_async/README.rst
@@ -139,7 +139,7 @@ so:
 On the host application, some config options need to be used to select the H4
 driver instead of the built-in controller:
 
-.. code-block:: kconfig
+.. code-block:: cfg
 
    CONFIG_BT_HCI=y
    CONFIG_BT_CTLR=n
diff --git a/samples/modules/tflite-micro/hello_world/README.rst b/samples/modules/tflite-micro/hello_world/README.rst
index daafcec0ea8..5a8492cc889 100644
--- a/samples/modules/tflite-micro/hello_world/README.rst
+++ b/samples/modules/tflite-micro/hello_world/README.rst
@@ -98,7 +98,7 @@ It is recommended that you copy and modify one of the two TensorFlow
 samples when creating your own TensorFlow project. To build with
 TensorFlow, you must enable the below Kconfig options in your :file:`prj.conf`:
 
-.. code-block:: kconfig
+.. code-block:: cfg
 
     CONFIG_CPP=y
     CONFIG_REQUIRES_FULL_LIBC=y
@@ -108,7 +108,7 @@ Note that the CMSIS-NN kernel sample demonstrates how to use CMSIS-NN optimized
 TensorFlow Lite Micro, in that is sets below Kconfig option. Note also that this
 Kconfig option is only set for Arm Cortex-M cores, i.e. option CPU_CORTEX_M is set.
 
-.. code-block:: kconfig
+.. code-block:: cfg
 
     CONFIG_TENSORFLOW_LITE_MICRO_CMSIS_NN_KERNELS=y
 
diff --git a/samples/modules/tflite-micro/magic_wand/README.rst b/samples/modules/tflite-micro/magic_wand/README.rst
index 7f8188c9db3..21839d7ec46 100644
--- a/samples/modules/tflite-micro/magic_wand/README.rst
+++ b/samples/modules/tflite-micro/magic_wand/README.rst
@@ -111,7 +111,7 @@ It is recommended that you copy and modify one of the two TensorFlow
 samples when creating your own TensorFlow project. To build with
 TensorFlow, you must enable the below Kconfig options in your :file:`prj.conf`:
 
-.. code-block:: kconfig
+.. code-block:: cfg
 
     CONFIG_CPP=y
     CONFIG_REQUIRES_FULL_LIBC=y
diff --git a/samples/net/cloud/mqtt_azure/README.rst b/samples/net/cloud/mqtt_azure/README.rst
index 1369b83d0e5..a2eb86c6bb7 100644
--- a/samples/net/cloud/mqtt_azure/README.rst
+++ b/samples/net/cloud/mqtt_azure/README.rst
@@ -76,7 +76,7 @@ Sample overlay file
 
 This is the overlay template for Azure IoT hub and other details:
 
-.. code-block:: console
+.. code-block:: cfg
 
 	CONFIG_SAMPLE_CLOUD_AZURE_USERNAME="<username>"
 	CONFIG_SAMPLE_CLOUD_AZURE_PASSWORD="<SAS token>"
diff --git a/samples/net/dns_resolve/README.rst b/samples/net/dns_resolve/README.rst
index ac2ea0f391b..0296ce1e716 100644
--- a/samples/net/dns_resolve/README.rst
+++ b/samples/net/dns_resolve/README.rst
@@ -47,7 +47,7 @@ In this sample application, both static or DHCPv4 IP addresses are supported.
 Static IP addresses are specified in the project configuration file,
 for example:
 
-.. code-block:: console
+.. code-block:: cfg
 
 	CONFIG_NET_CONFIG_MY_IPV6_ADDR="2001:db8::1"
 	CONFIG_NET_CONFIG_PEER_IPV6_ADDR="2001:db8::2"
@@ -75,7 +75,7 @@ the appropriate 'prj.conf' file and update the DNS server addresses.  For
 instance, if using the usual IP addresses assigned to testing, update them
 to the following values:
 
-.. code-block:: console
+.. code-block:: cfg
 
     CONFIG_DNS_SERVER1="192.0.2.2:5353"
     CONFIG_DNS_SERVER2="[2001:db8::2]:5353"
@@ -113,7 +113,7 @@ LLMNR Responder
 If you want Zephyr to respond to a LLMNR DNS request that Windows host is
 sending, then following config options could be set:
 
-.. code-block:: console
+.. code-block:: cfg
 
     CONFIG_NET_HOSTNAME_ENABLE=y
     CONFIG_NET_HOSTNAME="zephyr-device"
diff --git a/samples/net/mqtt_publisher/README.rst b/samples/net/mqtt_publisher/README.rst
index 2c22394036b..c9d4f77800c 100644
--- a/samples/net/mqtt_publisher/README.rst
+++ b/samples/net/mqtt_publisher/README.rst
@@ -84,9 +84,9 @@ following macros to specify those values:
 
 Max number of MQTT PUBLISH iterations is defined in Kconfig:
 
-.. code-block:: c
+.. code-block:: cfg
 
-	CONFIG_NET_SAMPLE_APP_MAX_ITERATIONS	5
+	CONFIG_NET_SAMPLE_APP_MAX_ITERATIONS=5
 
 On your Linux host computer, open a terminal window, locate the source code
 of this sample application (i.e., :zephyr_file:`samples/net/mqtt_publisher`) and type:
@@ -202,9 +202,9 @@ Sample output
 
 This is the output from the FRDM UART console, with:
 
-.. code-block:: c
+.. code-block:: cfg
 
-	CONFIG_NET_SAMPLE_APP_MAX_ITERATIONS     5
+	CONFIG_NET_SAMPLE_APP_MAX_ITERATIONS=5
 
 .. code-block:: console
 
diff --git a/samples/net/syslog_net/README.rst b/samples/net/syslog_net/README.rst
index 6e4247a5828..dd5908714b9 100644
--- a/samples/net/syslog_net/README.rst
+++ b/samples/net/syslog_net/README.rst
@@ -26,7 +26,7 @@ Building and Running
 For configuring the remote IPv6 syslog server, set the following
 variables in prj.conf file:
 
-.. code-block:: console
+.. code-block:: cfg
 
 	CONFIG_LOG_BACKEND_NET=y
 	CONFIG_LOG_BACKEND_NET_SERVER="[2001:db8::2]:514"
diff --git a/samples/tfm_integration/psa_crypto/README.rst b/samples/tfm_integration/psa_crypto/README.rst
index 2173cc35643..68ff38245c5 100644
--- a/samples/tfm_integration/psa_crypto/README.rst
+++ b/samples/tfm_integration/psa_crypto/README.rst
@@ -74,11 +74,13 @@ This sample will only build on a Linux or macOS development system
 
 TF-M BL2 logs
 =============
-Add the following to ``prj.conf`` to see the logs from TF-M BL2:
-   .. code-block:: bash
 
-      CONFIG_TFM_BL2=y
-      CONFIG_TFM_CMAKE_BUILD_TYPE_DEBUG=y
+Add the following to ``prj.conf`` to see the logs from TF-M BL2:
+
+.. code-block:: cfg
+
+   CONFIG_TFM_BL2=y
+   CONFIG_TFM_CMAKE_BUILD_TYPE_DEBUG=y
 
 On MPS2+ AN521:
 ===============