diff --git a/roles/gitlab_runner/templates/clouds.yaml.j2 b/roles/gitlab_runner/templates/clouds.yaml.j2
index e49f5f7..990b19f 100644
--- a/roles/gitlab_runner/templates/clouds.yaml.j2
+++ b/roles/gitlab_runner/templates/clouds.yaml.j2
@@ -1,7 +1,7 @@
 {#
-# SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden - Rossendorf (HZDR)
-#
-# SPDX-License-Identifier: Apache-2.0
+SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden - Rossendorf (HZDR)
+
+SPDX-License-Identifier: Apache-2.0
 #}
 clouds:
   openstack:
diff --git a/roles/gitlab_runner/templates/config.toml.j2 b/roles/gitlab_runner/templates/config.toml.j2
index ef654fe..7510717 100644
--- a/roles/gitlab_runner/templates/config.toml.j2
+++ b/roles/gitlab_runner/templates/config.toml.j2
@@ -1,8 +1,8 @@
 {#
-# SPDX-FileCopyrightText: Helmholtz Centre for Environmental Research (UFZ)
-# SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden - Rossendorf (HZDR)
-#
-# SPDX-License-Identifier: Apache-2.0
+SPDX-FileCopyrightText: Helmholtz Centre for Environmental Research (UFZ)
+SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden - Rossendorf (HZDR)
+
+SPDX-License-Identifier: Apache-2.0
 #}
 concurrent = {{ gitlab_runner_concurrent }}
 {% if gitlab_runner_listen_address | length > 0 %}
diff --git a/roles/gitlab_runner/templates/flatcar-linux-config.bu.j2 b/roles/gitlab_runner/templates/flatcar-linux-config.bu.j2
index 79e9975..fe6a8cd 100644
--- a/roles/gitlab_runner/templates/flatcar-linux-config.bu.j2
+++ b/roles/gitlab_runner/templates/flatcar-linux-config.bu.j2
@@ -1,8 +1,8 @@
 {#
-# SPDX-FileCopyrightText: Helmholtz Centre for Environmental Research (UFZ)
-# SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden - Rossendorf (HZDR)
-#
-# SPDX-License-Identifier: Apache-2.0
+SPDX-FileCopyrightText: Helmholtz Centre for Environmental Research (UFZ)
+SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden - Rossendorf (HZDR)
+
+SPDX-License-Identifier: Apache-2.0
 #}
 variant: flatcar
 version: 1.1.0
diff --git a/roles/gitlab_runner/templates/pin-gitlab-runner.pref.j2 b/roles/gitlab_runner/templates/pin-gitlab-runner.pref.j2
index 9505097..044ce74 100644
--- a/roles/gitlab_runner/templates/pin-gitlab-runner.pref.j2
+++ b/roles/gitlab_runner/templates/pin-gitlab-runner.pref.j2
@@ -1,3 +1,9 @@
+{#
+SPDX-FileCopyrightText: Helmholtz Centre for Environmental Research (UFZ)
+SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden - Rossendorf (HZDR)
+
+SPDX-License-Identifier: Apache-2.0
+#}
 Explanation: Prefer GitLab provided packages over the Debian native ones
 Package: gitlab-runner
 Pin: origin packages.gitlab.com{% if gitlab_runner_version | length > 0 %}, version {{ gitlab_runner_pkg_version }}{% endif +%}
diff --git a/roles/gitlab_runner/templates/pin-gitlab-runner.pref.j2.license b/roles/gitlab_runner/templates/pin-gitlab-runner.pref.j2.license
deleted file mode 100644
index b327045..0000000
--- a/roles/gitlab_runner/templates/pin-gitlab-runner.pref.j2.license
+++ /dev/null
@@ -1,4 +0,0 @@
-SPDX-FileCopyrightText: Helmholtz Centre for Environmental Research (UFZ)
-SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden - Rossendorf (HZDR)
-
-SPDX-License-Identifier: Apache-2.0
diff --git a/roles/gitlab_runner/templates/runner_config.j2 b/roles/gitlab_runner/templates/runner_config.j2
index 7475b42..41f24d4 100644
--- a/roles/gitlab_runner/templates/runner_config.j2
+++ b/roles/gitlab_runner/templates/runner_config.j2
@@ -1,7 +1,7 @@
 {#
-# SPDX-FileCopyrightText: Helmholtz Centre for Environmental Research (UFZ)
-# SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden - Rossendorf (HZDR)
-#
-# SPDX-License-Identifier: Apache-2.0
+SPDX-FileCopyrightText: Helmholtz Centre for Environmental Research (UFZ)
+SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden - Rossendorf (HZDR)
+
+SPDX-License-Identifier: Apache-2.0
 #}
 {{ runner_config }}
diff --git a/roles/keepalived/templates/keepalived.conf.j2 b/roles/keepalived/templates/keepalived.conf.j2
index fe03484..80c0ce4 100644
--- a/roles/keepalived/templates/keepalived.conf.j2
+++ b/roles/keepalived/templates/keepalived.conf.j2
@@ -1,8 +1,9 @@
-# SPDX-FileCopyrightText: Helmholtz Centre for Environmental Research (UFZ)
-# SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden-Rossendorf (HZDR)
-#
-# SPDX-License-Identifier: Apache-2.0
+{#
+SPDX-FileCopyrightText: Helmholtz Centre for Environmental Research (UFZ)
+SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden-Rossendorf (HZDR)
 
+SPDX-License-Identifier: Apache-2.0
+#}
 global_defs {
 {% if keepalived_activate_script %}
     script_user {{ keepalived_script_user }} {{ keepalived_script_group }}
diff --git a/roles/keepalived/templates/keepalived.service.j2 b/roles/keepalived/templates/keepalived.service.j2
index da90407..8e40790 100644
--- a/roles/keepalived/templates/keepalived.service.j2
+++ b/roles/keepalived/templates/keepalived.service.j2
@@ -1,8 +1,9 @@
-# SPDX-FileCopyrightText: Helmholtz Centre for Environmental Research (UFZ)
-# SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden-Rossendorf (HZDR)
-#
-# SPDX-License-Identifier: Apache-2.0
+{#
+SPDX-FileCopyrightText: Helmholtz Centre for Environmental Research (UFZ)
+SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden-Rossendorf (HZDR)
 
+SPDX-License-Identifier: Apache-2.0
+#}
 [Unit]
 Description=LVS and VRRP High Availability Monitor
 After=network-online.target syslog.target
diff --git a/roles/unattended_upgrades/templates/apt_daily_override.conf.j2 b/roles/unattended_upgrades/templates/apt_daily_override.conf.j2
index a03e163..2085051 100644
--- a/roles/unattended_upgrades/templates/apt_daily_override.conf.j2
+++ b/roles/unattended_upgrades/templates/apt_daily_override.conf.j2
@@ -1,3 +1,9 @@
+{#
+SPDX-FileCopyrightText: Helmholtz Centre for Environmental Research (UFZ)
+SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden-Rossendorf (HZDR)
+
+SPDX-License-Identifier: GPL-2.0-or-later
+#}
 [Unit]
 Description=Daily apt download activities
 
diff --git a/roles/unattended_upgrades/templates/apt_daily_override.conf.j2.license b/roles/unattended_upgrades/templates/apt_daily_override.conf.j2.license
deleted file mode 100644
index 565650c..0000000
--- a/roles/unattended_upgrades/templates/apt_daily_override.conf.j2.license
+++ /dev/null
@@ -1,4 +0,0 @@
-SPDX-FileCopyrightText: Helmholtz Centre for Environmental Research (UFZ)
-SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden-Rossendorf (HZDR)
-
-SPDX-License-Identifier: Apache-2.0
diff --git a/roles/unattended_upgrades/templates/apt_daily_upgrade_override.conf.j2 b/roles/unattended_upgrades/templates/apt_daily_upgrade_override.conf.j2
index b624247..b817c12 100644
--- a/roles/unattended_upgrades/templates/apt_daily_upgrade_override.conf.j2
+++ b/roles/unattended_upgrades/templates/apt_daily_upgrade_override.conf.j2
@@ -1,3 +1,9 @@
+{#
+SPDX-FileCopyrightText: Helmholtz Centre for Environmental Research (UFZ)
+SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden-Rossendorf (HZDR)
+
+SPDX-License-Identifier: GPL-2.0-or-later
+#}
 [Unit]
 Description=Daily apt upgrade and clean activities
 After=apt-daily.timer
diff --git a/roles/unattended_upgrades/templates/apt_daily_upgrade_override.conf.j2.license b/roles/unattended_upgrades/templates/apt_daily_upgrade_override.conf.j2.license
deleted file mode 100644
index 565650c..0000000
--- a/roles/unattended_upgrades/templates/apt_daily_upgrade_override.conf.j2.license
+++ /dev/null
@@ -1,4 +0,0 @@
-SPDX-FileCopyrightText: Helmholtz Centre for Environmental Research (UFZ)
-SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden-Rossendorf (HZDR)
-
-SPDX-License-Identifier: Apache-2.0
diff --git a/roles/unattended_upgrades/templates/unattended-upgrades.j2 b/roles/unattended_upgrades/templates/unattended-upgrades.j2
index 502bbcd..54b20ea 100644
--- a/roles/unattended_upgrades/templates/unattended-upgrades.j2
+++ b/roles/unattended_upgrades/templates/unattended-upgrades.j2
@@ -1,3 +1,10 @@
+{#
+SPDX-FileCopyrightText: Helmholtz Centre for Environmental Research (UFZ)
+SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden-Rossendorf (HZDR)
+SPDX-FileCopyrightText: Jan Vlnas
+
+SPDX-License-Identifier: GPL-2.0-or-later
+#}
 {{ ansible_managed | comment('c') }}
 
 // Erase unattended-upgrades configuration tree
diff --git a/roles/unattended_upgrades/templates/unattended-upgrades.j2.license b/roles/unattended_upgrades/templates/unattended-upgrades.j2.license
deleted file mode 100644
index b72b264..0000000
--- a/roles/unattended_upgrades/templates/unattended-upgrades.j2.license
+++ /dev/null
@@ -1,5 +0,0 @@
-SPDX-FileCopyrightText: Helmholtz Centre for Environmental Research (UFZ)
-SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden-Rossendorf (HZDR)
-SPDX-FileCopyrightText: Jan Vlnas
-
-SPDX-License-Identifier: Apache-2.0
diff --git a/roles/zammad/templates/nginx-zammad.conf.j2 b/roles/zammad/templates/nginx-zammad.conf.j2
index 4d7aab2..4fbaae1 100644
--- a/roles/zammad/templates/nginx-zammad.conf.j2
+++ b/roles/zammad/templates/nginx-zammad.conf.j2
@@ -1,3 +1,9 @@
+{#
+SPDX-FileCopyrightText: Helmholtz Centre for Environmental Research (UFZ)
+SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden-Rossendorf (HZDR)
+
+SPDX-License-Identifier: MIT
+#}
 # {{ ansible_managed }}
 #
 # this is the nginx config for zammad
diff --git a/roles/zammad/templates/nginx-zammad.conf.j2.license b/roles/zammad/templates/nginx-zammad.conf.j2.license
deleted file mode 100644
index dafcfba..0000000
--- a/roles/zammad/templates/nginx-zammad.conf.j2.license
+++ /dev/null
@@ -1,4 +0,0 @@
-SPDX-FileCopyrightText: Helmholtz Centre for Environmental Research (UFZ)
-SPDX-FileCopyrightText: Helmholtz-Zentrum Dresden-Rossendorf (HZDR)
-
-SPDX-License-Identifier: MIT