diff --git a/.github/workflows/codecov.yaml b/.github/workflows/codecov.yaml
index 7f7199c4a62..aaf0313cf9d 100644
--- a/.github/workflows/codecov.yaml
+++ b/.github/workflows/codecov.yaml
@@ -112,7 +112,7 @@ jobs:
     name: "Publish Coverage Results"
     needs: codecov
     runs-on: ubuntu-20.04
-      # the codecov job might be skipped, we don't need to run this job then
+    # the codecov job might be skipped, we don't need to run this job then
     if: success() || failure()
 
     steps:
diff --git a/.github/workflows/stale-workflow-queue-cleanup.yml b/.github/workflows/stale-workflow-queue-cleanup.yml
index 38768102885..d601536d055 100644
--- a/.github/workflows/stale-workflow-queue-cleanup.yml
+++ b/.github/workflows/stale-workflow-queue-cleanup.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     branches: [main]
   schedule:
-    # everyday at 15:00
+  # everyday at 15:00
   - cron: '0 15 * * *'
 
 concurrency:
diff --git a/.github/workflows/twister.yaml b/.github/workflows/twister.yaml
index 0015d0b2ac8..d26ec92afaa 100644
--- a/.github/workflows/twister.yaml
+++ b/.github/workflows/twister.yaml
@@ -271,7 +271,7 @@ jobs:
       OPENSEARCH_PASS: ${{ secrets.OPENSEARCH_PASS }}
     needs: twister-build
     runs-on: ubuntu-20.04
-      # the build-and-test job might be skipped, we don't need to run this job then
+    # the build-and-test job might be skipped, we don't need to run this job then
     if: success() || failure()
 
     steps:
diff --git a/dts/bindings/espi/microchip,xec-espi-host-dev.yaml b/dts/bindings/espi/microchip,xec-espi-host-dev.yaml
index 7fabd95cbb9..70802cb8156 100644
--- a/dts/bindings/espi/microchip,xec-espi-host-dev.yaml
+++ b/dts/bindings/espi/microchip,xec-espi-host-dev.yaml
@@ -26,7 +26,7 @@ properties:
       type: array
       description: PCR sleep register index and bit position
 
-# optional properties application to different host facing devices
+    # optional properties application to different host facing devices
     host-io:
       type: int
       description: |
diff --git a/dts/bindings/pwm/atmel,sam-pwm.yaml b/dts/bindings/pwm/atmel,sam-pwm.yaml
index 693f9c9088f..03481180202 100644
--- a/dts/bindings/pwm/atmel,sam-pwm.yaml
+++ b/dts/bindings/pwm/atmel,sam-pwm.yaml
@@ -37,6 +37,6 @@ properties:
 
 pwm-cells:
   - channel
-# period in terms of nanoseconds
+  # period in terms of nanoseconds
   - period
   - flags
diff --git a/dts/bindings/pwm/fsl,imx27-pwm.yaml b/dts/bindings/pwm/fsl,imx27-pwm.yaml
index 50371cbe398..a4c6c774cfe 100644
--- a/dts/bindings/pwm/fsl,imx27-pwm.yaml
+++ b/dts/bindings/pwm/fsl,imx27-pwm.yaml
@@ -34,5 +34,5 @@ properties:
 
 pwm-cells:
   - channel
-# period in terms of nanoseconds
+  # period in terms of nanoseconds
   - period
diff --git a/dts/bindings/pwm/nxp,kinetis-ftm-pwm.yaml b/dts/bindings/pwm/nxp,kinetis-ftm-pwm.yaml
index 4732436f972..40a86d6d14c 100644
--- a/dts/bindings/pwm/nxp,kinetis-ftm-pwm.yaml
+++ b/dts/bindings/pwm/nxp,kinetis-ftm-pwm.yaml
@@ -17,6 +17,6 @@ properties:
 
 pwm-cells:
   - channel
-# period in terms of nanoseconds
+  # period in terms of nanoseconds
   - period
   - flags
diff --git a/dts/bindings/pwm/nxp,kinetis-pwt.yaml b/dts/bindings/pwm/nxp,kinetis-pwt.yaml
index c158f1149b7..ee387ace92d 100644
--- a/dts/bindings/pwm/nxp,kinetis-pwt.yaml
+++ b/dts/bindings/pwm/nxp,kinetis-pwt.yaml
@@ -33,6 +33,6 @@ properties:
 
 pwm-cells:
   - channel
-# period in terms of nanoseconds
+  # period in terms of nanoseconds
   - period
   - flags
diff --git a/dts/bindings/pwm/nxp,kinetis-tpm.yaml b/dts/bindings/pwm/nxp,kinetis-tpm.yaml
index b71a85c5cc2..2014e42aad1 100644
--- a/dts/bindings/pwm/nxp,kinetis-tpm.yaml
+++ b/dts/bindings/pwm/nxp,kinetis-tpm.yaml
@@ -23,6 +23,6 @@ properties:
 
 pwm-cells:
   - channel
-# period in terms of nanoseconds
+  # period in terms of nanoseconds
   - period
   - flags
diff --git a/dts/bindings/pwm/openisa,rv32m1-tpm.yaml b/dts/bindings/pwm/openisa,rv32m1-tpm.yaml
index 1deec9acae6..853559e8dad 100644
--- a/dts/bindings/pwm/openisa,rv32m1-tpm.yaml
+++ b/dts/bindings/pwm/openisa,rv32m1-tpm.yaml
@@ -19,6 +19,6 @@ properties:
 
 pwm-cells:
   - channel
-# period in terms of nanoseconds
+  # period in terms of nanoseconds
   - period
   - flags
diff --git a/dts/bindings/pwm/raspberrypi,pico-pwm.yaml b/dts/bindings/pwm/raspberrypi,pico-pwm.yaml
index 233dac8c46b..df61be19a50 100644
--- a/dts/bindings/pwm/raspberrypi,pico-pwm.yaml
+++ b/dts/bindings/pwm/raspberrypi,pico-pwm.yaml
@@ -104,10 +104,10 @@ properties:
       const: 3
 
 pwm-cells:
-# The rpi pico pwm peripheral is divided in 8 slices with an individual
-# clock setting and two output channels. The pwm channels are mapped the
-# following way PWM_CH0_A is addressed as <&pwm 0 PWM_FLAGS>, PWM_CH0B
-# is <&pwm 1 PMW_FLAGS>, PWM_CH1_A si <&pwm 2 PWM_FLAGS> and so on.
+  # The rpi pico pwm peripheral is divided in 8 slices with an individual
+  # clock setting and two output channels. The pwm channels are mapped the
+  # following way PWM_CH0_A is addressed as <&pwm 0 PWM_FLAGS>, PWM_CH0B
+  # is <&pwm 1 PMW_FLAGS>, PWM_CH1_A si <&pwm 2 PWM_FLAGS> and so on.
   - channel
   - period
   - flags
diff --git a/dts/bindings/pwm/sifive,pwm0.yaml b/dts/bindings/pwm/sifive,pwm0.yaml
index 126d7e95d6d..83647c35d76 100644
--- a/dts/bindings/pwm/sifive,pwm0.yaml
+++ b/dts/bindings/pwm/sifive,pwm0.yaml
@@ -24,5 +24,5 @@ properties:
 
 pwm-cells:
   - channel
-# period in terms of nanoseconds
+  # period in terms of nanoseconds
   - period
diff --git a/dts/bindings/pwm/xlnx,xps-timer-1.00.a-pwm.yaml b/dts/bindings/pwm/xlnx,xps-timer-1.00.a-pwm.yaml
index 8890dbf58ea..e32422819d7 100644
--- a/dts/bindings/pwm/xlnx,xps-timer-1.00.a-pwm.yaml
+++ b/dts/bindings/pwm/xlnx,xps-timer-1.00.a-pwm.yaml
@@ -19,6 +19,6 @@ properties:
 
 pwm-cells:
   - channel
-# period in terms of nanoseconds
+  # period in terms of nanoseconds
   - period
   - flags
diff --git a/dts/bindings/rtc/nordic,nrf-rtc.yaml b/dts/bindings/rtc/nordic,nrf-rtc.yaml
index 56e11fc088e..f01117fd7d1 100644
--- a/dts/bindings/rtc/nordic,nrf-rtc.yaml
+++ b/dts/bindings/rtc/nordic,nrf-rtc.yaml
@@ -27,9 +27,9 @@ properties:
       type: boolean
       description: Enable wrapping with PPI
 
-   # If enabled then counter based on nRF RTC peripheral supports only maximal
-   # top value. That results in code optimizations and availability of one more
-   # channel
+    # If enabled then counter based on nRF RTC peripheral supports only maximal
+    # top value. That results in code optimizations and availability of one more
+    # channel
     fixed-top:
       type: boolean
       description: Enable fixed top value
diff --git a/dts/bindings/usb/usb-audio-hp.yaml b/dts/bindings/usb/usb-audio-hp.yaml
index bdf748c0173..af77f3e13ea 100644
--- a/dts/bindings/usb/usb-audio-hp.yaml
+++ b/dts/bindings/usb/usb-audio-hp.yaml
@@ -18,7 +18,7 @@ properties:
      - 16
      - 24
      - 32
-# channel configuration options
+  # channel configuration options
   channel-l:
     type: boolean
     description: Enable (l) channel.
@@ -58,7 +58,7 @@ properties:
   channel-cfg:
     type: boolean
     description: Enable (cfg) channel.
-# feature unit configuration options
+  # feature unit configuration options
   feature-mute:
     type: boolean
     required: true
diff --git a/dts/bindings/usb/usb-audio-hs.yaml b/dts/bindings/usb/usb-audio-hs.yaml
index 6931886b56c..3f74b62c7d1 100644
--- a/dts/bindings/usb/usb-audio-hs.yaml
+++ b/dts/bindings/usb/usb-audio-hs.yaml
@@ -38,7 +38,7 @@ properties:
      - 16
      - 24
      - 32
-# microphone channel configuration options
+  # microphone channel configuration options
   mic-channel-l:
     type: boolean
     description: Enable (l) channel.
@@ -78,7 +78,7 @@ properties:
   mic-channel-cfg:
     type: boolean
     description: Enable (cfg) channel.
-# microphone feature unit configuration options
+  # microphone feature unit configuration options
   mic-feature-mute:
     type: boolean
     required: true
@@ -158,7 +158,7 @@ properties:
   hp-channel-cfg:
     type: boolean
     description: Enable (cfg) channel.
-# headphones feature unit configuration options
+  # headphones feature unit configuration options
   hp-feature-mute:
     type: boolean
     required: true
diff --git a/dts/bindings/usb/usb-audio-mic.yaml b/dts/bindings/usb/usb-audio-mic.yaml
index f0f4303ef7f..bbf407dc6df 100644
--- a/dts/bindings/usb/usb-audio-mic.yaml
+++ b/dts/bindings/usb/usb-audio-mic.yaml
@@ -30,7 +30,7 @@ properties:
      - "Asynchronous"
      - "Adaptive"
      - "Synchronous"
-# channel configuration options
+  # channel configuration options
   channel-l:
     type: boolean
     description: Enable (l) channel.
@@ -70,7 +70,7 @@ properties:
   channel-cfg:
     type: boolean
     description: Enable (cfg) channel.
-# feature unit configuration options
+  # feature unit configuration options
   feature-mute:
     type: boolean
     required: true
diff --git a/samples/net/sockets/http_get/sample.yaml b/samples/net/sockets/http_get/sample.yaml
index d7044cb132f..e7c7e2349e5 100644
--- a/samples/net/sockets/http_get/sample.yaml
+++ b/samples/net/sockets/http_get/sample.yaml
@@ -11,8 +11,8 @@ tests:
   sample.net.sockets.http_get:
     extra_configs:
       - CONFIG_NET_SOCKETS_POSIX_NAMES=y
-    # Forcibly defines CONFIG_POSIX_API, which is incompatible with
-    # CONFIG_NET_SOCKETS_POSIX_NAMES.
+      # Forcibly defines CONFIG_POSIX_API, which is incompatible with
+      # CONFIG_NET_SOCKETS_POSIX_NAMES.
   sample.net.sockets.http_get.posix:
     filter: not CONFIG_NET_SOCKETS_OFFLOAD
     platform_exclude: cc3220sf_launchxl cc3235sf_launchxl
diff --git a/samples/tfm_integration/tfm_secure_partition/dummy_partition/tfm_dummy_partition.yaml b/samples/tfm_integration/tfm_secure_partition/dummy_partition/tfm_dummy_partition.yaml
index 7900be454dd..d1b2c32190c 100644
--- a/samples/tfm_integration/tfm_secure_partition/dummy_partition/tfm_dummy_partition.yaml
+++ b/samples/tfm_integration/tfm_secure_partition/dummy_partition/tfm_dummy_partition.yaml
@@ -28,9 +28,12 @@
   # Service definitions for IPC mode.
   "services": [{
     "name": "TFM_DP_SECRET_DIGEST",
-    "sid": "0xFFFFF001", # Bits [31:12] denote the vendor (change this),
-                         # bits [11:0] are arbitrary at the discretion of the
-                         # vendor.
+
+    # Bits [31:12] denote the vendor (change this),
+    # bits [11:0] are arbitrary at the discretion of the
+    # vendor.
+    "sid": "0xFFFFF001",
+
     "non_secure_clients": true,
     "version": 1,
     "version_policy": "STRICT"
diff --git a/scripts/ci/tags.yaml b/scripts/ci/tags.yaml
index a512b0218cb..302da1a7764 100644
--- a/scripts/ci/tags.yaml
+++ b/scripts/ci/tags.yaml
@@ -49,8 +49,8 @@ bluetooth:
 cmsis_dsp:
     files:
         - modules/Kconfig.cmsis_dsp
-# we have no means of telling file changes in a module, so for assume any
-# change to west.yml is updating something we need to re-test for.
+        # we have no means of telling file changes in a module, so for assume any
+        # change to west.yml is updating something we need to re-test for.
         - west.yml
 
 kernel:
diff --git a/tests/benchmarks/latency_measure/testcase.yaml b/tests/benchmarks/latency_measure/testcase.yaml
index 44894c71d22..9ebc0f19cc7 100644
--- a/tests/benchmarks/latency_measure/testcase.yaml
+++ b/tests/benchmarks/latency_measure/testcase.yaml
@@ -14,9 +14,9 @@ tests:
         - "PROJECT EXECUTION SUCCESSFUL"
 
 
-# Cortex-M has 24bit systick, so default 1 TICK per seconds
-# is achievable only if frequency is below 0x00FFFFFF (around 16MHz)
-# 20 Ticks per secondes allows a frequency up to 335544300Hz (335MHz)
+  # Cortex-M has 24bit systick, so default 1 TICK per seconds
+  # is achievable only if frequency is below 0x00FFFFFF (around 16MHz)
+  # 20 Ticks per secondes allows a frequency up to 335544300Hz (335MHz)
   benchmark.kernel.latency.stm32:
     filter: CONFIG_PRINTK and CONFIG_SOC_FAMILY_STM32
     # FIXME: no DWT and no RTC_TIMER
diff --git a/tests/bluetooth/shell/testcase.yaml b/tests/bluetooth/shell/testcase.yaml
index 249051b1d1d..02ec9a01cc5 100644
--- a/tests/bluetooth/shell/testcase.yaml
+++ b/tests/bluetooth/shell/testcase.yaml
@@ -41,7 +41,7 @@ tests:
     extra_args: CONF_FILE="log.conf"
     tags: bluetooth
 
-# Bluetooth Audio Compile validation tests
+  # Bluetooth Audio Compile validation tests
   bluetooth.shell.audio:
     extra_args: CONF_FILE="audio.conf"
     build_only: true
diff --git a/tests/kernel/usage/thread_runtime_stats/testcase.yaml b/tests/kernel/usage/thread_runtime_stats/testcase.yaml
index 67ab1ec7cb3..14ac852bb02 100644
--- a/tests/kernel/usage/thread_runtime_stats/testcase.yaml
+++ b/tests/kernel/usage/thread_runtime_stats/testcase.yaml
@@ -1,12 +1,12 @@
 tests:
   kernel.usage:
     tags: kernel
-# The following architectures are excluded as they have boards that
-# exhibit precision timing anomalies related to emulation.
-#     posix, riscv32, sparc
-# The following architectures are exluded as the necessary
-# thread runtime statistic hooks do not yet exist.
-#     mips
+    # The following architectures are excluded as they have boards that
+    # exhibit precision timing anomalies related to emulation.
+    #     posix, riscv32, sparc
+    # The following architectures are exluded as the necessary
+    # thread runtime statistic hooks do not yet exist.
+    #     mips
     arch_exclude: posix sparc mips
-# SMP is excluded as the test was only written for UP
+    # SMP is excluded as the test was only written for UP
     filter: not CONFIG_SMP
diff --git a/tests/net/traffic_class/testcase.yaml b/tests/net/traffic_class/testcase.yaml
index 0dc67fb1d28..b47153c72ce 100644
--- a/tests/net/traffic_class/testcase.yaml
+++ b/tests/net/traffic_class/testcase.yaml
@@ -36,7 +36,7 @@ tests:
     extra_configs:
       - CONFIG_NET_TC_TX_COUNT=8
       - CONFIG_NET_TC_RX_COUNT=8
-# TX multi queue, RX one queue
+  # TX multi queue, RX one queue
   net.traffic_class.2_no_rx:
     extra_configs:
       - CONFIG_NET_TC_TX_COUNT=2
@@ -65,7 +65,7 @@ tests:
     extra_configs:
       - CONFIG_NET_TC_TX_COUNT=8
       - CONFIG_NET_TC_RX_COUNT=1
-# TX one queue, RX multi queue
+  # TX one queue, RX multi queue
   net.traffic_class.2_no_tx:
     extra_configs:
       - CONFIG_NET_TC_RX_COUNT=2
@@ -94,7 +94,7 @@ tests:
     extra_configs:
       - CONFIG_NET_TC_RX_COUNT=8
       - CONFIG_NET_TC_TX_COUNT=1
-# Then test some hybrid combinations.
+  # Then test some hybrid combinations.
   net.traffic_class.tx_2_rx_3:
     extra_configs:
       - CONFIG_NET_TC_RX_COUNT=3