diff --git a/packages/addons/addon-depends/docker/containerd/package.mk b/packages/addons/addon-depends/docker/containerd/package.mk
index d9acbd5ebd..3fdd06876e 100644
--- a/packages/addons/addon-depends/docker/containerd/package.mk
+++ b/packages/addons/addon-depends/docker/containerd/package.mk
@@ -1,5 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="containerd"
diff --git a/packages/addons/addon-depends/docker/tini/package.mk b/packages/addons/addon-depends/docker/tini/package.mk
index ec5520e4dd..0b9594d1ff 100644
--- a/packages/addons/addon-depends/docker/tini/package.mk
+++ b/packages/addons/addon-depends/docker/tini/package.mk
@@ -1,5 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="tini"
diff --git a/packages/addons/addon-depends/go/package.mk b/packages/addons/addon-depends/go/package.mk
index 162470d7a8..5fa2582602 100644
--- a/packages/addons/addon-depends/go/package.mk
+++ b/packages/addons/addon-depends/go/package.mk
@@ -1,5 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="go"
diff --git a/packages/addons/addon-depends/qt5/package.mk b/packages/addons/addon-depends/qt5/package.mk
index b980aa3a5b..d3c970ed4d 100644
--- a/packages/addons/addon-depends/qt5/package.mk
+++ b/packages/addons/addon-depends/qt5/package.mk
@@ -1,5 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="qt5"
diff --git a/packages/addons/addon-depends/runc/package.mk b/packages/addons/addon-depends/runc/package.mk
index 10c9e2ab3b..505eb5c59d 100644
--- a/packages/addons/addon-depends/runc/package.mk
+++ b/packages/addons/addon-depends/runc/package.mk
@@ -1,5 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="runc"
diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk
index 7b6ef1bad8..758ff82613 100644
--- a/packages/addons/service/docker/package.mk
+++ b/packages/addons/service/docker/package.mk
@@ -1,5 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2017 Lukas Rusak (lrusak@libreelec.tv)
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="docker"
diff --git a/packages/addons/service/docker/source/bin/docker-config b/packages/addons/service/docker/source/bin/docker-config
index 1b1d133d29..ca3d9b237f 100755
--- a/packages/addons/service/docker/source/bin/docker-config
+++ b/packages/addons/service/docker/source/bin/docker-config
@@ -1,8 +1,7 @@
 #!/bin/sh
 
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
-# Copyright (C) 2022-present Team LibreELEC (https://libreelec.tv)
+# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 ADDON_DIR="/storage/.kodi/addons/service.system.docker"
 ADDON_HOME_DIR="/storage/.kodi/userdata/addon_data/service.system.docker"
diff --git a/packages/addons/service/docker/source/default.py b/packages/addons/service/docker/source/default.py
index dbc5ca8bd3..3cf2014424 100644
--- a/packages/addons/service/docker/source/default.py
+++ b/packages/addons/service/docker/source/default.py
@@ -1,5 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
 
 import os
@@ -10,7 +9,7 @@ import xbmc
 import xbmcaddon
 import xbmcgui
 
-__author__      = 'lrusak'
+__author__      = 'LibreELEC'
 __addon__       = xbmcaddon.Addon()
 __path__        = __addon__.getAddonInfo('path')
 
diff --git a/packages/addons/service/hyperion/package.mk b/packages/addons/service/hyperion/package.mk
index 279710ddd1..28a9f764c3 100644
--- a/packages/addons/service/hyperion/package.mk
+++ b/packages/addons/service/hyperion/package.mk
@@ -1,5 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="hyperion"
diff --git a/packages/addons/service/hyperion/source/bin/hyperiond.start b/packages/addons/service/hyperion/source/bin/hyperiond.start
index f9aac15adb..c1cb3388cb 100644
--- a/packages/addons/service/hyperion/source/bin/hyperiond.start
+++ b/packages/addons/service/hyperion/source/bin/hyperiond.start
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
+# Copyright (C) 2016 Team LibreELEC (https://libreelec.tv)
 
 . /etc/profile
 
diff --git a/packages/addons/service/hyperion/source/default.py b/packages/addons/service/hyperion/source/default.py
index 6121a93630..7c285c0bb9 100644
--- a/packages/addons/service/hyperion/source/default.py
+++ b/packages/addons/service/hyperion/source/default.py
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
+# Copyright (C) 2016 Team LibreELEC (https://libreelec.tv)
 
 import xbmc
 
diff --git a/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk b/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk
index 0ddc5f5e2d..44098aabd5 100644
--- a/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/peripheral.joystick/package.mk
@@ -1,5 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="peripheral.joystick"
diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.asterwave/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.asterwave/package.mk
index 5c315b8fbf..046f8fa7a8 100644
--- a/packages/mediacenter/kodi-binary-addons/screensaver.asterwave/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/screensaver.asterwave/package.mk
@@ -1,5 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="screensaver.asterwave"
diff --git a/packages/mediacenter/kodi-binary-addons/visualization.pictureit/package.mk b/packages/mediacenter/kodi-binary-addons/visualization.pictureit/package.mk
index b4292c41fd..1bdd6c09ca 100644
--- a/packages/mediacenter/kodi-binary-addons/visualization.pictureit/package.mk
+++ b/packages/mediacenter/kodi-binary-addons/visualization.pictureit/package.mk
@@ -1,5 +1,4 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="visualization.pictureit"
diff --git a/tools/download-tool b/tools/download-tool
index 92f42bebaa..b854042a26 100755
--- a/tools/download-tool
+++ b/tools/download-tool
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
+# Copyright (C) 2016 Team LibreELEC (https://libreelec.tv)
 
 if [ -z "$PROJECT" -a -z "$ARCH" ]; then
   echo "Usage: PROJECT=<project> ARCH=<arch> $0"
diff --git a/tools/repo-tool b/tools/repo-tool
index c1295aff01..ceb4ed1631 100755
--- a/tools/repo-tool
+++ b/tools/repo-tool
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # SPDX-License-Identifier: GPL-2.0-or-later
-# Copyright (C) 2009-2016 Lukas Rusak (lrusak@libreelec.tv)
+# Copyright (C) 2016 Team LibreELEC (https://libreelec.tv)
 
 . config/options