diff --git a/data/lib/systemd/system/plinth.service b/data/lib/systemd/system/plinth.service
index 267d994ca..20960cf4d 100644
--- a/data/lib/systemd/system/plinth.service
+++ b/data/lib/systemd/system/plinth.service
@@ -1,19 +1,4 @@
-#
-# This file is part of FreedomBox.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
+# SPDX-License-Identifier: AGPL-3.0-or-later
 
 [Unit]
 Description=FreedomBox Service (Plinth)
diff --git a/data/usr/share/dbus-1/system.d/org.freedombox.Service.conf b/data/usr/share/dbus-1/system.d/org.freedombox.Service.conf
index 107a20ea3..40124e828 100644
--- a/data/usr/share/dbus-1/system.d/org.freedombox.Service.conf
+++ b/data/usr/share/dbus-1/system.d/org.freedombox.Service.conf
@@ -3,7 +3,8 @@
   "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
 
 <!--
-This file is part of FreedomBox.
+
+SPDX-License-Identifier: AGPL-3.0-or-later
 
 Allow only root and plinth users to send any notifications to FreedomBox Service
 or to own the FreedomBox Service.
diff --git a/plinth/modules/letsencrypt/data/etc/letsencrypt/renewal-hooks/deploy/50-freedombox b/plinth/modules/letsencrypt/data/etc/letsencrypt/renewal-hooks/deploy/50-freedombox
index 06f17519a..9a1a96aa7 100755
--- a/plinth/modules/letsencrypt/data/etc/letsencrypt/renewal-hooks/deploy/50-freedombox
+++ b/plinth/modules/letsencrypt/data/etc/letsencrypt/renewal-hooks/deploy/50-freedombox
@@ -1,20 +1,5 @@
 #!/bin/bash
-#
-# This file is part of FreedomBox.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
+# SPDX-License-Identifier: AGPL-3.0-or-later
 
 set -e
 
diff --git a/plinth/modules/networks/data/etc/NetworkManager/dispatcher.d/10-freedombox-batman b/plinth/modules/networks/data/etc/NetworkManager/dispatcher.d/10-freedombox-batman
index 096a5f3a0..0db60cab0 100755
--- a/plinth/modules/networks/data/etc/NetworkManager/dispatcher.d/10-freedombox-batman
+++ b/plinth/modules/networks/data/etc/NetworkManager/dispatcher.d/10-freedombox-batman
@@ -1,20 +1,5 @@
 #!/bin/bash
-#
-# This file is part of FreedomBox.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
+# SPDX-License-Identifier: AGPL-3.0-or-later
 
 set -e  # Exit with code on error
 
diff --git a/plinth/modules/networks/data/usr/share/polkit-1/rules.d/50-plinth.rules b/plinth/modules/networks/data/usr/share/polkit-1/rules.d/50-plinth.rules
index 57822c766..b5c3b8867 100644
--- a/plinth/modules/networks/data/usr/share/polkit-1/rules.d/50-plinth.rules
+++ b/plinth/modules/networks/data/usr/share/polkit-1/rules.d/50-plinth.rules
@@ -1,20 +1,5 @@
 /*
-#
-# This file is part of FreedomBox.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
+# SPDX-License-Identifier: AGPL-3.0-or-later
 */
 
 polkit.addRule(function(action, subject) {
diff --git a/plinth/modules/storage/data/lib/systemd/system/freedombox-udiskie.service b/plinth/modules/storage/data/lib/systemd/system/freedombox-udiskie.service
index 2598ba53f..431113857 100644
--- a/plinth/modules/storage/data/lib/systemd/system/freedombox-udiskie.service
+++ b/plinth/modules/storage/data/lib/systemd/system/freedombox-udiskie.service
@@ -1,19 +1,4 @@
-#
-# This file is part of FreedomBox.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
+# SPDX-License-Identifier: AGPL-3.0-or-later
 
 [Unit]
 Description=handle automounting
diff --git a/plinth/modules/upgrades/data/lib/systemd/system/freedombox-setup-repositories.service b/plinth/modules/upgrades/data/lib/systemd/system/freedombox-setup-repositories.service
index 7a12f7cb2..99b1a4a22 100644
--- a/plinth/modules/upgrades/data/lib/systemd/system/freedombox-setup-repositories.service
+++ b/plinth/modules/upgrades/data/lib/systemd/system/freedombox-setup-repositories.service
@@ -1,19 +1,4 @@
-#
-# This file is part of FreedomBox.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
+# SPDX-License-Identifier: AGPL-3.0-or-later
 
 [Unit]
 Description=FreedomBox: Setup software repositories
diff --git a/plinth/modules/upgrades/data/lib/systemd/system/freedombox-setup-repositories.timer b/plinth/modules/upgrades/data/lib/systemd/system/freedombox-setup-repositories.timer
index 7f9896f21..8702cebab 100644
--- a/plinth/modules/upgrades/data/lib/systemd/system/freedombox-setup-repositories.timer
+++ b/plinth/modules/upgrades/data/lib/systemd/system/freedombox-setup-repositories.timer
@@ -1,19 +1,4 @@
-#
-# This file is part of FreedomBox.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Affero General Public License as
-# published by the Free Software Foundation, either version 3 of the
-# License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Affero General Public License for more details.
-#
-# You should have received a copy of the GNU Affero General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
+# SPDX-License-Identifier: AGPL-3.0-or-later
 
 [Unit]
 Description=FreedomBox: Daily check for setting up software repositories