diff --git a/config/docker/package.mk b/config/docker/package.mk
index 91d7fcb5ed..fd963a65df 100644
--- a/config/docker/package.mk
+++ b/config/docker/package.mk
@@ -1,20 +1,5 @@
-################################################################################
-# This file is part of LibreELEC - https://libreelec.tv
-# Copyright (C) 2016 Team LibreELEC
-#
-# LibreELEC is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# LibreELEC 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with LibreELEC. If not, see .
-################################################################################
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="@NAME@"
PKG_VERSION="@VERSION@" # Update bin/docker.@NAME@ accordingly
diff --git a/config/docker/source/bin/docker b/config/docker/source/bin/docker
index c003a413f7..8a2c39672d 100644
--- a/config/docker/source/bin/docker
+++ b/config/docker/source/bin/docker
@@ -1,21 +1,7 @@
#!/bin/sh
-################################################################################
-# This file is part of LibreELEC - https://libreelec.tv
-# Copyright (C) 2016 Team LibreELEC
-#
-# LibreELEC is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# LibreELEC 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with LibreELEC. If not, see .
-################################################################################
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
name="$(basename $0)"
. /etc/profile
diff --git a/config/docker/source/default.py b/config/docker/source/default.py
index 6c6b84a8a5..0b9d649ccd 100644
--- a/config/docker/source/default.py
+++ b/config/docker/source/default.py
@@ -1,20 +1,5 @@
-################################################################################
-# This file is part of LibreELEC - https://libreelec.tv
-# Copyright (C) 2016 Team LibreELEC
-#
-# LibreELEC is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# LibreELEC 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with LibreELEC. If not, see .
-################################################################################
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
import subprocess
import xbmc
diff --git a/config/noobs/partition_setup.sh b/config/noobs/partition_setup.sh
index 52ebab5819..50577f5e6b 100755
--- a/config/noobs/partition_setup.sh
+++ b/config/noobs/partition_setup.sh
@@ -1,21 +1,7 @@
#!/bin/sh -x
-################################################################################
-# This file is part of OpenELEC - http://www.openelec.tv
-# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
-#
-# OpenELEC is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# OpenELEC 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 General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with OpenELEC. If not, see .
-################################################################################
+
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
MOUNTPOINT="/tmp/LibreELEC-System"