diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 65e2cb3ea683b..3536ffd1e949a 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,6 @@
-<!-- SPDX-License-Identifier: Apache-2.0 https://www.apache.org/licenses/LICENSE-2.0 -->
+ <!-- SPDX-License-Identifier: Apache-2.0
+      https://www.apache.org/licenses/LICENSE-2.0 -->
+
 <!--
 Thank you for contributing!
 
diff --git a/.github/SECURITY.md b/.github/SECURITY.md
index bff00e33dd9f1..8db6f2a98d792 100644
--- a/.github/SECURITY.md
+++ b/.github/SECURITY.md
@@ -1,4 +1,5 @@
-<!-- SPDX-License-Identifier: Apache-2.0 https://www.apache.org/licenses/LICENSE-2.0 -->
+ <!-- SPDX-License-Identifier: Apache-2.0
+      https://www.apache.org/licenses/LICENSE-2.0 -->
 
 <!-- START doctoc generated TOC please keep comment here to allow auto update -->
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
diff --git a/AGENTS.md b/AGENTS.md
index e57c76e81c93d..8a6c305006232 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -1,4 +1,6 @@
-<!-- SPDX-License-Identifier: Apache-2.0 https://www.apache.org/licenses/LICENSE-2.0 -->
+ <!-- SPDX-License-Identifier: Apache-2.0
+      https://www.apache.org/licenses/LICENSE-2.0 -->
+
 # AGENTS instructions
 
 The main developer documentation lives in the `contributing-docs` directory. The following points summarise
diff --git a/scripts/ci/license-templates/SHORT_LICENSE.md b/scripts/ci/license-templates/SHORT_LICENSE.md
index 00f6fac8f3647..f7e12815e3d4a 100644
--- a/scripts/ci/license-templates/SHORT_LICENSE.md
+++ b/scripts/ci/license-templates/SHORT_LICENSE.md
@@ -1 +1,2 @@
-<!-- SPDX-License-Identifier: Apache-2.0 https://www.apache.org/licenses/LICENSE-2.0 -->
+<!-- SPDX-License-Identifier: Apache-2.0
+     https://www.apache.org/licenses/LICENSE-2.0 -->