diff --git a/.gitignore b/.gitignore
index a1b96ce..bd7dab7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 *.pro.user*
-
+build/
 
 coverage-html
 client/nymea-remoteproxy-client
diff --git a/COPYING b/COPYING
new file mode 120000
index 0000000..2eac441
--- /dev/null
+++ b/COPYING
@@ -0,0 +1 @@
+LICENSE.GPL3
\ No newline at end of file
diff --git a/COPYING.LESSER b/COPYING.LESSER
new file mode 120000
index 0000000..dc71033
--- /dev/null
+++ b/COPYING.LESSER
@@ -0,0 +1 @@
+LICENSE.LGPL3
\ No newline at end of file
diff --git a/LICENSE.GPL3 b/LICENSE.GPL3
index 9b60556..f288702 100644
--- a/LICENSE.GPL3
+++ b/LICENSE.GPL3
@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    nymea-remoteproxy
-    Copyright (C) 2018  cloud
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -645,14 +645,14 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    nymea-remoteproxy  Copyright (C) 2018  cloud
+    <program>  Copyright (C) <year>  <name of author>
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/README.md b/README.md
index 95ccf12..ce9d8c3 100644
--- a/README.md
+++ b/README.md
@@ -1,129 +1,139 @@
 # nymea remote proxy server
-----------------------------------------------
 
-The nymea remote proxy server is the meeting point of nymea servers and nymea clients in order to establishing a secure remote connection.
+The nymea remote proxy server acts as the rendezvous point between nymea servers and nymea clients and provides a secure tunnel to reach devices that sit behind NAT or firewalled networks.
 
-# Build
+## Features
 
-In order to build the proxy server you need to install the qt default package.
+- Secure TLS-protected tunnels between nymea instances.
+- JSON-RPC based control plane with optional monitoring interface.
+- Usable as system service or launched from a build tree for development.
 
-    apt install qtbase5-dev qtbase5-dev-tools libqt5websockets5-dev libncurses5-dev dpkg-dev debhelper
+## Requirements
+
+To build the proxy from source, install the Qt development packages and the helper tools that produce the Debian packages:
+
+```
+sudo apt install debhelper dpkg-dev pkg-config qt6-base-dev qt6-base-dev-tools \
+                 qt6-websockets-dev libncurses5-dev
+```
 
 ## Build from source
-Change into the source directory and run following commands
 
-    $ cd nymea-remoteproxy
-    $ mkdir build
-    $ cd build
-    $ qmake ../
-    $ make -j$(nproc)
+```
+cd nymea-remoteproxy
+mkdir -p build && cd build
+qmake ../
+make -j$(nproc)
+```
 
-In the build directory you can find the resulting library and binary files.
+The resulting binaries and libraries will be available in the `build` directory. When running directly from there, the helper libraries must be discoverable:
 
-If you want to start the proxy server from the build directory, you need to export the library path before starting the application:
+```
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/libnymea-remoteproxy:$(pwd)/libnymea-remoteproxyclient
+./server/nymea-remoteproxy -c ../nymea-remoteproxy/nymea-remoteproxy.conf
+```
 
-    $ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/libnymea-remoteproxy:$(pwd)/libnymea-remoteproxyclient
-    $ ./server/nymea-remoteproxy -c ../nymea-remoteproxy/nymea-remoteproxy.conf
+## Install
 
+### From repository
 
-# Install
+Official nymea packages are available:
 
-## From repository
-There is a public version available in the nymea repository.
+```
+sudo apt install nymea-remoteproxy nymea-remoteproxy-tunnelclient nymea-remoteproxy-monitor
+```
 
-    $ apt install nymea-remoteproxy nymea-remoteproxy-tunnelclient nymea-remoteproxy-monitor
+The installation starts the `nymea-remoteproxy.service` systemd unit and also installs a test client.
 
-This will install a systemd service called `nymea-remoteproxy.service` and the client application for testing.
+### From build directory
 
-## From build directory
+```
+sudo make install
+```
 
-Simply run following command in the build dir:
+## Configuration
 
-    $ sudo make install
+The package ships `/etc/nymea/nymea-remoteproxy.conf` which can be used verbatim or as a template:
 
-# Configure
+```
+[ProxyServer]
+name=nymea-remoteproxy
+writeLogs=false
+logFile=/var/log/nymea-remoteproxy.log
+logEngineEnabled=false
+monitorSocket=/tmp/nymea-remoteproxy-monitor.sock
+jsonRpcTimeout=10000
+inactiveTimeout=8000
 
-The package will deliver a default configuration file with following content (`/etc/nymea/nymea-remoteproxy.conf`):
-    
-    [ProxyServer]
-    name=nymea-remoteproxy
-    writeLogs=false
-    logFile=/var/log/nymea-remoteproxy.log
-    logEngineEnabled=false
-    monitorSocket=/tmp/nymea-remoteproxy-monitor.sock
-    jsonRpcTimeout=10000
-    inactiveTimeout=8000
-    
-    [SSL]
-    enabled=false
-    certificate=/etc/ssl/certs/ssl-cert-snakeoil.pem
-    certificateKey=/etc/ssl/private/ssl-cert-snakeoil.key
-    certificateChain=
-    
-    [UnixSocketServerTunnelProxy]
-    unixSocketFileName=/run/nymea-remoteproxy.socket
-    
-    [WebSocketServerTunnelProxy]
-    host=127.0.0.1
-    port=2212
-    
-    [TcpServerTunnelProxy]
-    host=127.0.0.1
-    port=2213
-    
+[SSL]
+enabled=false
+certificate=/etc/ssl/certs/ssl-cert-snakeoil.pem
+certificateKey=/etc/ssl/private/ssl-cert-snakeoil.key
+certificateChain=
 
-## Test coverage report
+[UnixSocketServerTunnelProxy]
+unixSocketFileName=/run/nymea-remoteproxy.socket
 
-If you want to create a line coverage report from the tests simply run following command in the source directory:
+[WebSocketServerTunnelProxy]
+host=127.0.0.1
+port=2212
 
-> Note: run `qmake` with the argument `CONFIG+=converage` in order to generate coverage data for the tests. Then run the tests before creating the coverage report.
+[TcpServerTunnelProxy]
+host=127.0.0.1
+port=2213
+```
 
-    $ apt install lcov gcovr
-    $ ./create-coverage-html.sh
+## Test coverage
 
-The resulting coverage report will be place in the `coverage-html` directory.
+To generate a line coverage report:
 
-# Testing a local server
+- Run `qmake CONFIG+=coverage` and execute the tests to produce the `.gcno`/`.gcda` data.
+- Install tooling and generate the HTML report:
 
-With following steps you can test a local instance with a self signed certificate.
+```
+sudo apt install lcov gcovr
+./create-coverage-html.sh
+```
 
-## Start the server
+The HTML output lives in `coverage-html/`.
 
-In order to test a connection and play with the server API, you can install the proxy server on your machine and try to connect to it.
+## Testing a local server
 
-    $ sudo apt update
-    $ sudo apt install nymea-remoteproxy nymea-remoteproxy-tunnelclient
+You can experiment with a local instance by issuing a self-signed certificate and pointing the proxy to it.
 
-Once installed, the `nymea-remoteproxy` will start automatically using the default configurations shipped in `/etc/nymea/nymea-remoteproxy.conf`.
-Using this file allowes you to configure the server for your test purposes.
+```
+sudo apt update
+sudo apt install nymea-remoteproxy nymea-remoteproxy-tunnelclient
+```
 
-The only thing you need is a certificate, which can be loaded from the server. The server does not support insecure connection for now. If you don't have any certificate, you can create one for testing.
+After installation the daemon starts automatically using `/etc/nymea/nymea-remoteproxy.conf`, which you can adapt for local testing. Create a throwaway certificate:
 
-> *Note:* you can enter whatever you like for the certificate.
+```
+cd /tmp
+openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
+        -keyout test-proxy-certificate.key \
+        -out test-proxy-certificate.crt
+sudo cp test-proxy-certificate.crt /etc/ssl/certs/
+sudo cp test-proxy-certificate.key /etc/ssl/private/
+```
 
-    $ cd /tmp/
-    $ openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout test-proxy-certificate.key -out test-proxy-certificate.crt
+Adjust the config:
 
-Now place the certificate and the key where they belong:
+```
+certificate=/etc/ssl/certs/test-proxy-certificate.crt
+certificateKey=/etc/ssl/private/test-proxy-certificate.key
+```
 
-    $ sudo cp /tmp/test-proxy-certificate.crt /etc/ssl/certs/
-    $ sudo cp /tmp/test-proxy-certificate.key /etc/ssl/private/
+Restart manually for verbose output:
 
-Change following configuration in the `/etc/nymea/nymea-remoteproxy.conf`:
+```
+sudo systemctl stop nymea-remoteproxy.service
+sudo nymea-remoteproxy -c /etc/nymea/nymea-remoteproxy.conf --verbose
+```
 
-    ...
-    certificate=/etc/ssl/certs/test-proxy-certificate.crt
-    certificateKey=/etc/ssl/private/test-proxy-certificate.key
-    ...
+## License
 
-Now stop the proxy server and start it manually:
-
-    $ sudo systemctl stop nymea-remoteproxy.service
-
-    $ sudo nymea-remoteproxy -c /etc/nymea/nymea-remoteproxy --verbose
-
-
-# License
-
-This 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, version 3 of the License.
+The nymea-remoteproxy server, monitoring tools, and tunnel client are distributed under the terms of the GNU General Public License version 3. 
 
+The reusable libraries located in `libnymea-remoteproxy` and `libnymea-remoteproxyclient` are provided under the GNU Lesser General Public License version 3 (or later).
+See `LICENSE.GPL3` and `LICENSE.LGPL3` for the full texts.
diff --git a/common/slipdataprocessor.cpp b/common/slipdataprocessor.cpp
index 4cb32f5..a2ab18a 100644
--- a/common/slipdataprocessor.cpp
+++ b/common/slipdataprocessor.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2022, nymea GmbH
-* Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-* This file is part of nymea.
-* This project including source code and documentation is protected by copyright law, and
-* remains the property of nymea GmbH. All rights, including reproduction, publication,
-* editing and translation, are reserved. The use of this project is subject to the terms of a
-* license agreement to be concluded with nymea GmbH in accordance with the terms
-* of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-* GNU Lesser General Public License Usage
-* Alternatively, this project may be redistributed and/or modified under the terms of the GNU
-* Lesser General Public License as published by the Free Software Foundation; version 3.
-* this project 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 Lesser General Public License for more details.
+* This file is part of nymea-remoteproxy.
 *
-* You should have received a copy of the GNU Lesser General Public License along with this project.
-* If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-* For any further details and any questions please contact us under contact@nymea.io
-* or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "slipdataprocessor.h"
 
diff --git a/common/slipdataprocessor.h b/common/slipdataprocessor.h
index 56c1c65..ea892aa 100644
--- a/common/slipdataprocessor.h
+++ b/common/slipdataprocessor.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2022, nymea GmbH
-* Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-* This file is part of nymea.
-* This project including source code and documentation is protected by copyright law, and
-* remains the property of nymea GmbH. All rights, including reproduction, publication,
-* editing and translation, are reserved. The use of this project is subject to the terms of a
-* license agreement to be concluded with nymea GmbH in accordance with the terms
-* of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-* GNU Lesser General Public License Usage
-* Alternatively, this project may be redistributed and/or modified under the terms of the GNU
-* Lesser General Public License as published by the Free Software Foundation; version 3.
-* this project 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 Lesser General Public License for more details.
+* This file is part of nymea-remoteproxy.
 *
-* You should have received a copy of the GNU Lesser General Public License along with this project.
-* If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-* For any further details and any questions please contact us under contact@nymea.io
-* or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef SLIPDATAPROCESSOR_H
 #define SLIPDATAPROCESSOR_H
diff --git a/debian-qt5/control b/debian-qt5/control
index 3b840fa..7e163bb 100644
--- a/debian-qt5/control
+++ b/debian-qt5/control
@@ -1,12 +1,12 @@
 Source: nymea-remoteproxy
 Section: utils
 Priority: optional
-Maintainer: nymea GmbH <developer@nymea.io>
+Maintainer: chargebyte austria GmbH <contact@nymea.io>
 Standards-Version: 4.6.0
 Homepage: https://nymea.io
 Vcs-Git: https://github.com/nymea/nymea-remoteproxy.git
-Build-depends: debhelper (>= 9.0.0),
-               dpkg-dev (>= 1.16.1~),
+Build-depends: debhelper,
+               dpkg-dev,
                pkg-config,
                qtbase5-dev,
                qtbase5-dev-tools,
diff --git a/debian-qt5/copyright b/debian-qt5/copyright
index d4de476..4227130 100644
--- a/debian-qt5/copyright
+++ b/debian-qt5/copyright
@@ -1,7 +1,8 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: nymea-remoteproxy
-Upstream-Contact: Simon Stürz <simon.stuerz@nymea.io>
-Copyright: 2018 - 2024, nymea GmbH
+Upstream-Contact: chargebyte austria GmbH <contact@nymea.io>
+Copyright: 2018-2024, nymea GmbH
+           2024-2025, chargebyte austria GmbH
 Download: http://www.github.com/nymea/nymea-remoteproxy
 Source: https://github.com/nymea/nymea-remoteproxy.git
 
@@ -14,5 +15,13 @@ License: LGPL-3
  Public License can be found in `/usr/share/common-licenses/LGPL-3'.
 
 Files: *
-License: LGPL-3
 Copyright: 2018 - 2024, nymea GmbH <developer@nymea.io>
+           2024 - 2025, chargebyte austria GmbH <contact@nymea.io>
+License: GPL-3
+
+Files: libnymea-remoteproxy/*
+       libnymea-remoteproxyclient/*
+       common/*
+Copyright: 2018 - 2024, nymea GmbH <developer@nymea.io>
+           2024 - 2025, chargebyte austria GmbH <contact@nymea.io>
+License: LGPL-3
diff --git a/debian-qt6/control b/debian-qt6/control
index fd9a830..34de0cd 100644
--- a/debian-qt6/control
+++ b/debian-qt6/control
@@ -1,12 +1,12 @@
 Source: nymea-remoteproxy
 Section: net
 Priority: optional
-Maintainer: nymea GmbH <developer@nymea.io>
+Maintainer: chargebyte austria GmbH <contact@nymea.io>
 Standards-Version: 4.7.2
 Homepage: https://nymea.io
 Vcs-Git: https://github.com/nymea/nymea-remoteproxy.git
-Build-depends: debhelper (>= 9.0.0),
-               dpkg-dev (>= 1.16.1~),
+Build-depends: debhelper,
+               dpkg-dev,
                pkg-config,
                qt6-base-dev,
                qt6-base-dev-tools,
diff --git a/libnymea-remoteproxy/engine.cpp b/libnymea-remoteproxy/engine.cpp
index 6206334..8777293 100644
--- a/libnymea-remoteproxy/engine.cpp
+++ b/libnymea-remoteproxy/engine.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "engine.h"
 #include "loggingcategories.h"
diff --git a/libnymea-remoteproxy/engine.h b/libnymea-remoteproxy/engine.h
index 65b4edf..b0234ff 100644
--- a/libnymea-remoteproxy/engine.h
+++ b/libnymea-remoteproxy/engine.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef ENGINE_H
 #define ENGINE_H
diff --git a/libnymea-remoteproxy/jsonrpc/jsonhandler.cpp b/libnymea-remoteproxy/jsonrpc/jsonhandler.cpp
index 2eb571e..d212bf8 100644
--- a/libnymea-remoteproxy/jsonrpc/jsonhandler.cpp
+++ b/libnymea-remoteproxy/jsonrpc/jsonhandler.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "jsonhandler.h"
 #include <QMetaMethod>
diff --git a/libnymea-remoteproxy/jsonrpc/jsonhandler.h b/libnymea-remoteproxy/jsonrpc/jsonhandler.h
index d8c3ec8..49861af 100644
--- a/libnymea-remoteproxy/jsonrpc/jsonhandler.h
+++ b/libnymea-remoteproxy/jsonrpc/jsonhandler.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef JSONHANDLER_H
 #define JSONHANDLER_H
diff --git a/libnymea-remoteproxy/jsonrpc/jsonreply.cpp b/libnymea-remoteproxy/jsonrpc/jsonreply.cpp
index 3753c87..1780c61 100644
--- a/libnymea-remoteproxy/jsonrpc/jsonreply.cpp
+++ b/libnymea-remoteproxy/jsonrpc/jsonreply.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "engine.h"
 #include "jsonreply.h"
diff --git a/libnymea-remoteproxy/jsonrpc/jsonreply.h b/libnymea-remoteproxy/jsonrpc/jsonreply.h
index bf582a1..414a8b2 100644
--- a/libnymea-remoteproxy/jsonrpc/jsonreply.h
+++ b/libnymea-remoteproxy/jsonrpc/jsonreply.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef JSONRPCREPLY_H
 #define JSONRPCREPLY_H
diff --git a/libnymea-remoteproxy/jsonrpc/jsontypes.cpp b/libnymea-remoteproxy/jsonrpc/jsontypes.cpp
index 57f6cf6..fb23236 100644
--- a/libnymea-remoteproxy/jsonrpc/jsontypes.cpp
+++ b/libnymea-remoteproxy/jsonrpc/jsontypes.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "jsontypes.h"
 #include <QStringList>
diff --git a/libnymea-remoteproxy/jsonrpc/jsontypes.h b/libnymea-remoteproxy/jsonrpc/jsontypes.h
index 9be5c21..63ea3d6 100644
--- a/libnymea-remoteproxy/jsonrpc/jsontypes.h
+++ b/libnymea-remoteproxy/jsonrpc/jsontypes.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef JSONTYPES_H
 #define JSONTYPES_H
diff --git a/libnymea-remoteproxy/jsonrpc/tunnelproxyhandler.cpp b/libnymea-remoteproxy/jsonrpc/tunnelproxyhandler.cpp
index cb62549..beea4c9 100644
--- a/libnymea-remoteproxy/jsonrpc/tunnelproxyhandler.cpp
+++ b/libnymea-remoteproxy/jsonrpc/tunnelproxyhandler.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2022, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "tunnelproxyhandler.h"
 
diff --git a/libnymea-remoteproxy/jsonrpc/tunnelproxyhandler.h b/libnymea-remoteproxy/jsonrpc/tunnelproxyhandler.h
index 59bf779..7d96669 100644
--- a/libnymea-remoteproxy/jsonrpc/tunnelproxyhandler.h
+++ b/libnymea-remoteproxy/jsonrpc/tunnelproxyhandler.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2022, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef TUNNELPROXYHANDLER_H
 #define TUNNELPROXYHANDLER_H
diff --git a/libnymea-remoteproxy/logengine.cpp b/libnymea-remoteproxy/logengine.cpp
index 0bfbeea..8f485a0 100644
--- a/libnymea-remoteproxy/logengine.cpp
+++ b/libnymea-remoteproxy/logengine.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "logengine.h"
 #include "loggingcategories.h"
diff --git a/libnymea-remoteproxy/logengine.h b/libnymea-remoteproxy/logengine.h
index 9668a1a..ac3c68e 100644
--- a/libnymea-remoteproxy/logengine.h
+++ b/libnymea-remoteproxy/logengine.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef LOGENGINE_H
 #define LOGENGINE_H
diff --git a/libnymea-remoteproxy/loggingcategories.cpp b/libnymea-remoteproxy/loggingcategories.cpp
index f13d1cd..c985298 100644
--- a/libnymea-remoteproxy/loggingcategories.cpp
+++ b/libnymea-remoteproxy/loggingcategories.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2022, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "loggingcategories.h"
 
diff --git a/libnymea-remoteproxy/loggingcategories.h b/libnymea-remoteproxy/loggingcategories.h
index cbc13a8..7f914c0 100644
--- a/libnymea-remoteproxy/loggingcategories.h
+++ b/libnymea-remoteproxy/loggingcategories.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2022, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef LOGGINGCATEGORIES_H
 #define LOGGINGCATEGORIES_H
diff --git a/libnymea-remoteproxy/proxyconfiguration.cpp b/libnymea-remoteproxy/proxyconfiguration.cpp
index f85ca9a..015cc63 100644
--- a/libnymea-remoteproxy/proxyconfiguration.cpp
+++ b/libnymea-remoteproxy/proxyconfiguration.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "loggingcategories.h"
 #include "proxyconfiguration.h"
diff --git a/libnymea-remoteproxy/proxyconfiguration.h b/libnymea-remoteproxy/proxyconfiguration.h
index d7f76fe..112dfc9 100644
--- a/libnymea-remoteproxy/proxyconfiguration.h
+++ b/libnymea-remoteproxy/proxyconfiguration.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef PROXYCONFIGURATION_H
 #define PROXYCONFIGURATION_H
diff --git a/libnymea-remoteproxy/server/jsonrpcserver.cpp b/libnymea-remoteproxy/server/jsonrpcserver.cpp
index 3aa83a8..fa46c44 100644
--- a/libnymea-remoteproxy/server/jsonrpcserver.cpp
+++ b/libnymea-remoteproxy/server/jsonrpcserver.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "engine.h"
 #include "jsonrpcserver.h"
diff --git a/libnymea-remoteproxy/server/jsonrpcserver.h b/libnymea-remoteproxy/server/jsonrpcserver.h
index f0f3be0..a15d391 100644
--- a/libnymea-remoteproxy/server/jsonrpcserver.h
+++ b/libnymea-remoteproxy/server/jsonrpcserver.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef JSONRPCSERVER_H
 #define JSONRPCSERVER_H
diff --git a/libnymea-remoteproxy/server/monitorserver.cpp b/libnymea-remoteproxy/server/monitorserver.cpp
index 9ba8fc4..8f4b003 100644
--- a/libnymea-remoteproxy/server/monitorserver.cpp
+++ b/libnymea-remoteproxy/server/monitorserver.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "engine.h"
 #include "monitorserver.h"
diff --git a/libnymea-remoteproxy/server/monitorserver.h b/libnymea-remoteproxy/server/monitorserver.h
index 9d7057d..d423c37 100644
--- a/libnymea-remoteproxy/server/monitorserver.h
+++ b/libnymea-remoteproxy/server/monitorserver.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef MONITORSERVER_H
 #define MONITORSERVER_H
diff --git a/libnymea-remoteproxy/server/tcpsocketserver.cpp b/libnymea-remoteproxy/server/tcpsocketserver.cpp
index 7dc7ad2..b130586 100644
--- a/libnymea-remoteproxy/server/tcpsocketserver.cpp
+++ b/libnymea-remoteproxy/server/tcpsocketserver.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "tcpsocketserver.h"
 #include "loggingcategories.h"
diff --git a/libnymea-remoteproxy/server/tcpsocketserver.h b/libnymea-remoteproxy/server/tcpsocketserver.h
index 1768891..8298f5b 100644
--- a/libnymea-remoteproxy/server/tcpsocketserver.h
+++ b/libnymea-remoteproxy/server/tcpsocketserver.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef TCPSOCKETSERVER_H
 #define TCPSOCKETSERVER_H
diff --git a/libnymea-remoteproxy/server/transportclient.cpp b/libnymea-remoteproxy/server/transportclient.cpp
index 35c68e5..3736f9d 100644
--- a/libnymea-remoteproxy/server/transportclient.cpp
+++ b/libnymea-remoteproxy/server/transportclient.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2022, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "transportclient.h"
 #include "server/transportinterface.h"
diff --git a/libnymea-remoteproxy/server/transportclient.h b/libnymea-remoteproxy/server/transportclient.h
index 29ca3d4..4bd6ef7 100644
--- a/libnymea-remoteproxy/server/transportclient.h
+++ b/libnymea-remoteproxy/server/transportclient.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2022, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef TRANSPORTCLIENT_H
 #define TRANSPORTCLIENT_H
diff --git a/libnymea-remoteproxy/server/transportinterface.cpp b/libnymea-remoteproxy/server/transportinterface.cpp
index 573c8e1..a9c3767 100644
--- a/libnymea-remoteproxy/server/transportinterface.cpp
+++ b/libnymea-remoteproxy/server/transportinterface.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "transportinterface.h"
 
diff --git a/libnymea-remoteproxy/server/transportinterface.h b/libnymea-remoteproxy/server/transportinterface.h
index 2abad50..d024d99 100644
--- a/libnymea-remoteproxy/server/transportinterface.h
+++ b/libnymea-remoteproxy/server/transportinterface.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef TRANSPORTINTERFACE_H
 #define TRANSPORTINTERFACE_H
diff --git a/libnymea-remoteproxy/server/unixsocketserver.cpp b/libnymea-remoteproxy/server/unixsocketserver.cpp
index d8c917b..7eb959a 100644
--- a/libnymea-remoteproxy/server/unixsocketserver.cpp
+++ b/libnymea-remoteproxy/server/unixsocketserver.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2022, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "unixsocketserver.h"
 
diff --git a/libnymea-remoteproxy/server/unixsocketserver.h b/libnymea-remoteproxy/server/unixsocketserver.h
index ab71911..6f35f6d 100644
--- a/libnymea-remoteproxy/server/unixsocketserver.h
+++ b/libnymea-remoteproxy/server/unixsocketserver.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2022, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef UNIXSOCKETSERVER_H
 #define UNIXSOCKETSERVER_H
diff --git a/libnymea-remoteproxy/server/websocketserver.cpp b/libnymea-remoteproxy/server/websocketserver.cpp
index bbc440f..c7eefa5 100644
--- a/libnymea-remoteproxy/server/websocketserver.cpp
+++ b/libnymea-remoteproxy/server/websocketserver.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "websocketserver.h"
 #include "loggingcategories.h"
diff --git a/libnymea-remoteproxy/server/websocketserver.h b/libnymea-remoteproxy/server/websocketserver.h
index e772297..96dfd70 100644
--- a/libnymea-remoteproxy/server/websocketserver.h
+++ b/libnymea-remoteproxy/server/websocketserver.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef WEBSOCKETSERVER_H
 #define WEBSOCKETSERVER_H
diff --git a/libnymea-remoteproxy/tunnelproxy/tunnelproxyclient.cpp b/libnymea-remoteproxy/tunnelproxy/tunnelproxyclient.cpp
index 161a825..81e9e35 100644
--- a/libnymea-remoteproxy/tunnelproxy/tunnelproxyclient.cpp
+++ b/libnymea-remoteproxy/tunnelproxy/tunnelproxyclient.cpp
@@ -1,3 +1,30 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+*
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
+*
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
+*
+* This file is part of nymea-remoteproxy.
+*
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
+*
+* nymea-remoteproxy 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 Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
 #include "tunnelproxyclient.h"
 #include "loggingcategories.h"
 #include "server/transportinterface.h"
diff --git a/libnymea-remoteproxy/tunnelproxy/tunnelproxyclient.h b/libnymea-remoteproxy/tunnelproxy/tunnelproxyclient.h
index f036490..c1decfc 100644
--- a/libnymea-remoteproxy/tunnelproxy/tunnelproxyclient.h
+++ b/libnymea-remoteproxy/tunnelproxy/tunnelproxyclient.h
@@ -1,3 +1,30 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+*
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
+*
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
+*
+* This file is part of nymea-remoteproxy.
+*
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
+*
+* nymea-remoteproxy 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 Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
 #ifndef TUNNELPROXYCLIENT_H
 #define TUNNELPROXYCLIENT_H
 
diff --git a/libnymea-remoteproxy/tunnelproxy/tunnelproxyclientconnection.cpp b/libnymea-remoteproxy/tunnelproxy/tunnelproxyclientconnection.cpp
index 6d965b3..f88ebe1 100644
--- a/libnymea-remoteproxy/tunnelproxy/tunnelproxyclientconnection.cpp
+++ b/libnymea-remoteproxy/tunnelproxy/tunnelproxyclientconnection.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2022, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "tunnelproxyclientconnection.h"
 #include "server/transportclient.h"
diff --git a/libnymea-remoteproxy/tunnelproxy/tunnelproxyclientconnection.h b/libnymea-remoteproxy/tunnelproxy/tunnelproxyclientconnection.h
index f124c0e..13db239 100644
--- a/libnymea-remoteproxy/tunnelproxy/tunnelproxyclientconnection.h
+++ b/libnymea-remoteproxy/tunnelproxy/tunnelproxyclientconnection.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2022, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef TUNNELPROXYCLIENTCONNECTION_H
 #define TUNNELPROXYCLIENTCONNECTION_H
diff --git a/libnymea-remoteproxy/tunnelproxy/tunnelproxyserver.cpp b/libnymea-remoteproxy/tunnelproxy/tunnelproxyserver.cpp
index 81c05a2..22737aa 100644
--- a/libnymea-remoteproxy/tunnelproxy/tunnelproxyserver.cpp
+++ b/libnymea-remoteproxy/tunnelproxy/tunnelproxyserver.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2022, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "tunnelproxyserver.h"
 #include "loggingcategories.h"
diff --git a/libnymea-remoteproxy/tunnelproxy/tunnelproxyserver.h b/libnymea-remoteproxy/tunnelproxy/tunnelproxyserver.h
index d01f8fb..15ec820 100644
--- a/libnymea-remoteproxy/tunnelproxy/tunnelproxyserver.h
+++ b/libnymea-remoteproxy/tunnelproxy/tunnelproxyserver.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2022, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef TUNNELPROXYSERVER_H
 #define TUNNELPROXYSERVER_H
diff --git a/libnymea-remoteproxy/tunnelproxy/tunnelproxyserverconnection.cpp b/libnymea-remoteproxy/tunnelproxy/tunnelproxyserverconnection.cpp
index d7b3615..0eb8690 100644
--- a/libnymea-remoteproxy/tunnelproxy/tunnelproxyserverconnection.cpp
+++ b/libnymea-remoteproxy/tunnelproxy/tunnelproxyserverconnection.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2022, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "tunnelproxyserverconnection.h"
 #include "server/transportclient.h"
diff --git a/libnymea-remoteproxy/tunnelproxy/tunnelproxyserverconnection.h b/libnymea-remoteproxy/tunnelproxy/tunnelproxyserverconnection.h
index bb29b8a..17f62cc 100644
--- a/libnymea-remoteproxy/tunnelproxy/tunnelproxyserverconnection.h
+++ b/libnymea-remoteproxy/tunnelproxy/tunnelproxyserverconnection.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef TUNNELPROXYSERVERCONNECTION_H
 #define TUNNELPROXYSERVERCONNECTION_H
diff --git a/libnymea-remoteproxyclient/jsonreply.cpp b/libnymea-remoteproxyclient/jsonreply.cpp
index 652c40b..34dbddd 100644
--- a/libnymea-remoteproxyclient/jsonreply.cpp
+++ b/libnymea-remoteproxyclient/jsonreply.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2023, nymea GmbH
-* Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-* This file is part of nymea.
-* This project including source code and documentation is protected by copyright law, and
-* remains the property of nymea GmbH. All rights, including reproduction, publication,
-* editing and translation, are reserved. The use of this project is subject to the terms of a
-* license agreement to be concluded with nymea GmbH in accordance with the terms
-* of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-* GNU Lesser General Public License Usage
-* Alternatively, this project may be redistributed and/or modified under the terms of the GNU
-* Lesser General Public License as published by the Free Software Foundation; version 3.
-* this project 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 Lesser General Public License for more details.
+* This file is part of nymea-remoteproxy.
 *
-* You should have received a copy of the GNU Lesser General Public License along with this project.
-* If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-* For any further details and any questions please contact us under contact@nymea.io
-* or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "jsonreply.h"
 
diff --git a/libnymea-remoteproxyclient/jsonreply.h b/libnymea-remoteproxyclient/jsonreply.h
index 7868acb..09b7a45 100644
--- a/libnymea-remoteproxyclient/jsonreply.h
+++ b/libnymea-remoteproxyclient/jsonreply.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2023, nymea GmbH
-* Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-* This file is part of nymea.
-* This project including source code and documentation is protected by copyright law, and
-* remains the property of nymea GmbH. All rights, including reproduction, publication,
-* editing and translation, are reserved. The use of this project is subject to the terms of a
-* license agreement to be concluded with nymea GmbH in accordance with the terms
-* of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-* GNU Lesser General Public License Usage
-* Alternatively, this project may be redistributed and/or modified under the terms of the GNU
-* Lesser General Public License as published by the Free Software Foundation; version 3.
-* this project 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 Lesser General Public License for more details.
+* This file is part of nymea-remoteproxy.
 *
-* You should have received a copy of the GNU Lesser General Public License along with this project.
-* If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-* For any further details and any questions please contact us under contact@nymea.io
-* or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef JSONREPLY_H
 #define JSONREPLY_H
diff --git a/libnymea-remoteproxyclient/proxyconnection.cpp b/libnymea-remoteproxyclient/proxyconnection.cpp
index dd4bfa3..4f60d79 100644
--- a/libnymea-remoteproxyclient/proxyconnection.cpp
+++ b/libnymea-remoteproxyclient/proxyconnection.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2023, nymea GmbH
-* Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-* This file is part of nymea.
-* This project including source code and documentation is protected by copyright law, and
-* remains the property of nymea GmbH. All rights, including reproduction, publication,
-* editing and translation, are reserved. The use of this project is subject to the terms of a
-* license agreement to be concluded with nymea GmbH in accordance with the terms
-* of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-* GNU Lesser General Public License Usage
-* Alternatively, this project may be redistributed and/or modified under the terms of the GNU
-* Lesser General Public License as published by the Free Software Foundation; version 3.
-* this project 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 Lesser General Public License for more details.
+* This file is part of nymea-remoteproxy.
 *
-* You should have received a copy of the GNU Lesser General Public License along with this project.
-* If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-* For any further details and any questions please contact us under contact@nymea.io
-* or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "proxyconnection.h"
 
diff --git a/libnymea-remoteproxyclient/proxyconnection.h b/libnymea-remoteproxyclient/proxyconnection.h
index f0d4ad2..16d5b0c 100644
--- a/libnymea-remoteproxyclient/proxyconnection.h
+++ b/libnymea-remoteproxyclient/proxyconnection.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2023, nymea GmbH
-* Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-* This file is part of nymea.
-* This project including source code and documentation is protected by copyright law, and
-* remains the property of nymea GmbH. All rights, including reproduction, publication,
-* editing and translation, are reserved. The use of this project is subject to the terms of a
-* license agreement to be concluded with nymea GmbH in accordance with the terms
-* of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-* GNU Lesser General Public License Usage
-* Alternatively, this project may be redistributed and/or modified under the terms of the GNU
-* Lesser General Public License as published by the Free Software Foundation; version 3.
-* this project 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 Lesser General Public License for more details.
+* This file is part of nymea-remoteproxy.
 *
-* You should have received a copy of the GNU Lesser General Public License along with this project.
-* If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-* For any further details and any questions please contact us under contact@nymea.io
-* or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef SOCKETCONNECTOR_H
 #define SOCKETCONNECTOR_H
diff --git a/libnymea-remoteproxyclient/proxyjsonrpcclient.cpp b/libnymea-remoteproxyclient/proxyjsonrpcclient.cpp
index aa05329..84ec7f8 100644
--- a/libnymea-remoteproxyclient/proxyjsonrpcclient.cpp
+++ b/libnymea-remoteproxyclient/proxyjsonrpcclient.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2023, nymea GmbH
-* Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-* This file is part of nymea.
-* This project including source code and documentation is protected by copyright law, and
-* remains the property of nymea GmbH. All rights, including reproduction, publication,
-* editing and translation, are reserved. The use of this project is subject to the terms of a
-* license agreement to be concluded with nymea GmbH in accordance with the terms
-* of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-* GNU Lesser General Public License Usage
-* Alternatively, this project may be redistributed and/or modified under the terms of the GNU
-* Lesser General Public License as published by the Free Software Foundation; version 3.
-* this project 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 Lesser General Public License for more details.
+* This file is part of nymea-remoteproxy.
 *
-* You should have received a copy of the GNU Lesser General Public License along with this project.
-* If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-* For any further details and any questions please contact us under contact@nymea.io
-* or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "proxyjsonrpcclient.h"
 #include "proxyconnection.h"
diff --git a/libnymea-remoteproxyclient/proxyjsonrpcclient.h b/libnymea-remoteproxyclient/proxyjsonrpcclient.h
index af96d84..9427349 100644
--- a/libnymea-remoteproxyclient/proxyjsonrpcclient.h
+++ b/libnymea-remoteproxyclient/proxyjsonrpcclient.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2023, nymea GmbH
-* Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-* This file is part of nymea.
-* This project including source code and documentation is protected by copyright law, and
-* remains the property of nymea GmbH. All rights, including reproduction, publication,
-* editing and translation, are reserved. The use of this project is subject to the terms of a
-* license agreement to be concluded with nymea GmbH in accordance with the terms
-* of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-* GNU Lesser General Public License Usage
-* Alternatively, this project may be redistributed and/or modified under the terms of the GNU
-* Lesser General Public License as published by the Free Software Foundation; version 3.
-* this project 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 Lesser General Public License for more details.
+* This file is part of nymea-remoteproxy.
 *
-* You should have received a copy of the GNU Lesser General Public License along with this project.
-* If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-* For any further details and any questions please contact us under contact@nymea.io
-* or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef JSONRPCCLIENT_H
 #define JSONRPCCLIENT_H
diff --git a/libnymea-remoteproxyclient/tcpsocketconnection.cpp b/libnymea-remoteproxyclient/tcpsocketconnection.cpp
index 36d7cb0..4107a5e 100644
--- a/libnymea-remoteproxyclient/tcpsocketconnection.cpp
+++ b/libnymea-remoteproxyclient/tcpsocketconnection.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "tcpsocketconnection.h"
 
diff --git a/libnymea-remoteproxyclient/tcpsocketconnection.h b/libnymea-remoteproxyclient/tcpsocketconnection.h
index cad1adc..0fcfb65 100644
--- a/libnymea-remoteproxyclient/tcpsocketconnection.h
+++ b/libnymea-remoteproxyclient/tcpsocketconnection.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef TCPSOCKETCONNECTION_H
 #define TCPSOCKETCONNECTION_H
diff --git a/libnymea-remoteproxyclient/tunnelproxy/tunnelproxyremoteconnection.cpp b/libnymea-remoteproxyclient/tunnelproxy/tunnelproxyremoteconnection.cpp
index 42cdacb..43274af 100644
--- a/libnymea-remoteproxyclient/tunnelproxy/tunnelproxyremoteconnection.cpp
+++ b/libnymea-remoteproxyclient/tunnelproxy/tunnelproxyremoteconnection.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2022, nymea GmbH
-* Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-* This file is part of nymea.
-* This project including source code and documentation is protected by copyright law, and
-* remains the property of nymea GmbH. All rights, including reproduction, publication,
-* editing and translation, are reserved. The use of this project is subject to the terms of a
-* license agreement to be concluded with nymea GmbH in accordance with the terms
-* of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-* GNU Lesser General Public License Usage
-* Alternatively, this project may be redistributed and/or modified under the terms of the GNU
-* Lesser General Public License as published by the Free Software Foundation; version 3.
-* this project 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 Lesser General Public License for more details.
+* This file is part of nymea-remoteproxy.
 *
-* You should have received a copy of the GNU Lesser General Public License along with this project.
-* If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-* For any further details and any questions please contact us under contact@nymea.io
-* or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "tunnelproxyremoteconnection.h"
 #include "proxyconnection.h"
diff --git a/libnymea-remoteproxyclient/tunnelproxy/tunnelproxyremoteconnection.h b/libnymea-remoteproxyclient/tunnelproxy/tunnelproxyremoteconnection.h
index 0db93b8..6a86534 100644
--- a/libnymea-remoteproxyclient/tunnelproxy/tunnelproxyremoteconnection.h
+++ b/libnymea-remoteproxyclient/tunnelproxy/tunnelproxyremoteconnection.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2022, nymea GmbH
-* Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-* This file is part of nymea.
-* This project including source code and documentation is protected by copyright law, and
-* remains the property of nymea GmbH. All rights, including reproduction, publication,
-* editing and translation, are reserved. The use of this project is subject to the terms of a
-* license agreement to be concluded with nymea GmbH in accordance with the terms
-* of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-* GNU Lesser General Public License Usage
-* Alternatively, this project may be redistributed and/or modified under the terms of the GNU
-* Lesser General Public License as published by the Free Software Foundation; version 3.
-* this project 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 Lesser General Public License for more details.
+* This file is part of nymea-remoteproxy.
 *
-* You should have received a copy of the GNU Lesser General Public License along with this project.
-* If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-* For any further details and any questions please contact us under contact@nymea.io
-* or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef TUNNELPROXYREMOTECONNECTION_H
 #define TUNNELPROXYREMOTECONNECTION_H
diff --git a/libnymea-remoteproxyclient/tunnelproxy/tunnelproxysocket.cpp b/libnymea-remoteproxyclient/tunnelproxy/tunnelproxysocket.cpp
index deab5b8..2bd5ae3 100644
--- a/libnymea-remoteproxyclient/tunnelproxy/tunnelproxysocket.cpp
+++ b/libnymea-remoteproxyclient/tunnelproxy/tunnelproxysocket.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2022, nymea GmbH
-* Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-* This file is part of nymea.
-* This project including source code and documentation is protected by copyright law, and
-* remains the property of nymea GmbH. All rights, including reproduction, publication,
-* editing and translation, are reserved. The use of this project is subject to the terms of a
-* license agreement to be concluded with nymea GmbH in accordance with the terms
-* of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-* GNU Lesser General Public License Usage
-* Alternatively, this project may be redistributed and/or modified under the terms of the GNU
-* Lesser General Public License as published by the Free Software Foundation; version 3.
-* this project 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 Lesser General Public License for more details.
+* This file is part of nymea-remoteproxy.
 *
-* You should have received a copy of the GNU Lesser General Public License along with this project.
-* If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-* For any further details and any questions please contact us under contact@nymea.io
-* or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "tunnelproxysocket.h"
 #include "proxyconnection.h"
diff --git a/libnymea-remoteproxyclient/tunnelproxy/tunnelproxysocket.h b/libnymea-remoteproxyclient/tunnelproxy/tunnelproxysocket.h
index 5a9d808..45d37ff 100644
--- a/libnymea-remoteproxyclient/tunnelproxy/tunnelproxysocket.h
+++ b/libnymea-remoteproxyclient/tunnelproxy/tunnelproxysocket.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2022, nymea GmbH
-* Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-* This file is part of nymea.
-* This project including source code and documentation is protected by copyright law, and
-* remains the property of nymea GmbH. All rights, including reproduction, publication,
-* editing and translation, are reserved. The use of this project is subject to the terms of a
-* license agreement to be concluded with nymea GmbH in accordance with the terms
-* of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-* GNU Lesser General Public License Usage
-* Alternatively, this project may be redistributed and/or modified under the terms of the GNU
-* Lesser General Public License as published by the Free Software Foundation; version 3.
-* this project 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 Lesser General Public License for more details.
+* This file is part of nymea-remoteproxy.
 *
-* You should have received a copy of the GNU Lesser General Public License along with this project.
-* If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-* For any further details and any questions please contact us under contact@nymea.io
-* or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef TUNNELPROXYSOCKET_H
 #define TUNNELPROXYSOCKET_H
diff --git a/libnymea-remoteproxyclient/tunnelproxy/tunnelproxysocketserver.cpp b/libnymea-remoteproxyclient/tunnelproxy/tunnelproxysocketserver.cpp
index 2aebc91..8cda6e7 100644
--- a/libnymea-remoteproxyclient/tunnelproxy/tunnelproxysocketserver.cpp
+++ b/libnymea-remoteproxyclient/tunnelproxy/tunnelproxysocketserver.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2022, nymea GmbH
-* Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-* This file is part of nymea.
-* This project including source code and documentation is protected by copyright law, and
-* remains the property of nymea GmbH. All rights, including reproduction, publication,
-* editing and translation, are reserved. The use of this project is subject to the terms of a
-* license agreement to be concluded with nymea GmbH in accordance with the terms
-* of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-* GNU Lesser General Public License Usage
-* Alternatively, this project may be redistributed and/or modified under the terms of the GNU
-* Lesser General Public License as published by the Free Software Foundation; version 3.
-* this project 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 Lesser General Public License for more details.
+* This file is part of nymea-remoteproxy.
 *
-* You should have received a copy of the GNU Lesser General Public License along with this project.
-* If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-* For any further details and any questions please contact us under contact@nymea.io
-* or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "tunnelproxysocketserver.h"
 #include "proxyconnection.h"
diff --git a/libnymea-remoteproxyclient/tunnelproxy/tunnelproxysocketserver.h b/libnymea-remoteproxyclient/tunnelproxy/tunnelproxysocketserver.h
index ab9fe3a..2114d98 100644
--- a/libnymea-remoteproxyclient/tunnelproxy/tunnelproxysocketserver.h
+++ b/libnymea-remoteproxyclient/tunnelproxy/tunnelproxysocketserver.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2022, nymea GmbH
-* Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-* This file is part of nymea.
-* This project including source code and documentation is protected by copyright law, and
-* remains the property of nymea GmbH. All rights, including reproduction, publication,
-* editing and translation, are reserved. The use of this project is subject to the terms of a
-* license agreement to be concluded with nymea GmbH in accordance with the terms
-* of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-* GNU Lesser General Public License Usage
-* Alternatively, this project may be redistributed and/or modified under the terms of the GNU
-* Lesser General Public License as published by the Free Software Foundation; version 3.
-* this project 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 Lesser General Public License for more details.
+* This file is part of nymea-remoteproxy.
 *
-* You should have received a copy of the GNU Lesser General Public License along with this project.
-* If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-* For any further details and any questions please contact us under contact@nymea.io
-* or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef TUNNELPROXYSOCKETSERVER_H
 #define TUNNELPROXYSOCKETSERVER_H
diff --git a/libnymea-remoteproxyclient/websocketconnection.cpp b/libnymea-remoteproxyclient/websocketconnection.cpp
index 9e17a2c..91a4165 100644
--- a/libnymea-remoteproxyclient/websocketconnection.cpp
+++ b/libnymea-remoteproxyclient/websocketconnection.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2023, nymea GmbH
-* Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-* This file is part of nymea.
-* This project including source code and documentation is protected by copyright law, and
-* remains the property of nymea GmbH. All rights, including reproduction, publication,
-* editing and translation, are reserved. The use of this project is subject to the terms of a
-* license agreement to be concluded with nymea GmbH in accordance with the terms
-* of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-* GNU Lesser General Public License Usage
-* Alternatively, this project may be redistributed and/or modified under the terms of the GNU
-* Lesser General Public License as published by the Free Software Foundation; version 3.
-* this project 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 Lesser General Public License for more details.
+* This file is part of nymea-remoteproxy.
 *
-* You should have received a copy of the GNU Lesser General Public License along with this project.
-* If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-* For any further details and any questions please contact us under contact@nymea.io
-* or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "websocketconnection.h"
 
diff --git a/libnymea-remoteproxyclient/websocketconnection.h b/libnymea-remoteproxyclient/websocketconnection.h
index e0bf59b..1b0f4bc 100644
--- a/libnymea-remoteproxyclient/websocketconnection.h
+++ b/libnymea-remoteproxyclient/websocketconnection.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef WEBSOCKETCONNECTOR_H
 #define WEBSOCKETCONNECTOR_H
diff --git a/monitor/main.cpp b/monitor/main.cpp
index 244431d..5e9210c 100644
--- a/monitor/main.cpp
+++ b/monitor/main.cpp
@@ -1,29 +1,26 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2022, nymea GmbH
-*  Contact: contact@nymea.io
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* This file is part of nymea-remoteproxy.
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* nymea-remoteproxy 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 3 of the License, or
+* (at your option) any later version.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy 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.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* You should have received a copy of the GNU General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <QUrl>
 #include <QFileInfo>
diff --git a/monitor/monitor.cpp b/monitor/monitor.cpp
index e5cab92..9b73737 100644
--- a/monitor/monitor.cpp
+++ b/monitor/monitor.cpp
@@ -1,29 +1,26 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* This file is part of nymea-remoteproxy.
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* nymea-remoteproxy 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 3 of the License, or
+* (at your option) any later version.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy 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.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* You should have received a copy of the GNU General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "monitor.h"
 #include <QJsonDocument>
diff --git a/monitor/monitor.h b/monitor/monitor.h
index 4edd15d..ae70f62 100644
--- a/monitor/monitor.h
+++ b/monitor/monitor.h
@@ -1,29 +1,26 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* This file is part of nymea-remoteproxy.
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* nymea-remoteproxy 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 3 of the License, or
+* (at your option) any later version.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy 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.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* You should have received a copy of the GNU General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef MONITOR_H
 #define MONITOR_H
diff --git a/monitor/monitorclient.cpp b/monitor/monitorclient.cpp
index fd04f06..c1ec45b 100644
--- a/monitor/monitorclient.cpp
+++ b/monitor/monitorclient.cpp
@@ -1,29 +1,26 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* This file is part of nymea-remoteproxy.
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* nymea-remoteproxy 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 3 of the License, or
+* (at your option) any later version.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy 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.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* You should have received a copy of the GNU General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "monitorclient.h"
 #include "utils.h"
diff --git a/monitor/monitorclient.h b/monitor/monitorclient.h
index b6f60b1..113b3df 100644
--- a/monitor/monitorclient.h
+++ b/monitor/monitorclient.h
@@ -1,29 +1,26 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* This file is part of nymea-remoteproxy.
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* nymea-remoteproxy 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 3 of the License, or
+* (at your option) any later version.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy 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.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* You should have received a copy of the GNU General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef MONITORCLIENT_H
 #define MONITORCLIENT_H
diff --git a/monitor/noninteractivemonitor.cpp b/monitor/noninteractivemonitor.cpp
index e8f6625..f149bc7 100644
--- a/monitor/noninteractivemonitor.cpp
+++ b/monitor/noninteractivemonitor.cpp
@@ -1,29 +1,26 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2022, nymea GmbH
-*  Contact: contact@nymea.io
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* This file is part of nymea-remoteproxy.
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* nymea-remoteproxy 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 3 of the License, or
+* (at your option) any later version.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy 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.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* You should have received a copy of the GNU General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "noninteractivemonitor.h"
 #include "utils.h"
diff --git a/monitor/noninteractivemonitor.h b/monitor/noninteractivemonitor.h
index 98046bf..9b0cbc7 100644
--- a/monitor/noninteractivemonitor.h
+++ b/monitor/noninteractivemonitor.h
@@ -1,29 +1,26 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2022, nymea GmbH
-*  Contact: contact@nymea.io
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* This file is part of nymea-remoteproxy.
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* nymea-remoteproxy 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 3 of the License, or
+* (at your option) any later version.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy 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.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* You should have received a copy of the GNU General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef NONINTERACTIVEMONITOR_H
 #define NONINTERACTIVEMONITOR_H
diff --git a/monitor/terminalwindow.cpp b/monitor/terminalwindow.cpp
index 0a0b001..182c988 100644
--- a/monitor/terminalwindow.cpp
+++ b/monitor/terminalwindow.cpp
@@ -1,29 +1,26 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* This file is part of nymea-remoteproxy.
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* nymea-remoteproxy 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 3 of the License, or
+* (at your option) any later version.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy 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.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* You should have received a copy of the GNU General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "terminalwindow.h"
 #include "utils.h"
diff --git a/monitor/terminalwindow.h b/monitor/terminalwindow.h
index 2bb4bac..46c0961 100644
--- a/monitor/terminalwindow.h
+++ b/monitor/terminalwindow.h
@@ -1,29 +1,26 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* This file is part of nymea-remoteproxy.
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* nymea-remoteproxy 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 3 of the License, or
+* (at your option) any later version.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy 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.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* You should have received a copy of the GNU General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef TERMINALWINDOW_H
 #define TERMINALWINDOW_H
diff --git a/monitor/utils.h b/monitor/utils.h
index 2ab1d20..5a121c4 100644
--- a/monitor/utils.h
+++ b/monitor/utils.h
@@ -1,29 +1,26 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2022, nymea GmbH
-*  Contact: contact@nymea.io
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* This file is part of nymea-remoteproxy.
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* nymea-remoteproxy 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 3 of the License, or
+* (at your option) any later version.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy 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.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* You should have received a copy of the GNU General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef UTILS_H
 #define UTILS_H
diff --git a/server/main.cpp b/server/main.cpp
index 2178bd3..1b6cfa5 100644
--- a/server/main.cpp
+++ b/server/main.cpp
@@ -1,29 +1,26 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* This file is part of nymea-remoteproxy.
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* nymea-remoteproxy 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 3 of the License, or
+* (at your option) any later version.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy 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.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* You should have received a copy of the GNU General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <QDir>
 #include <QUrl>
diff --git a/server/remoteproxyserverapplication.cpp b/server/remoteproxyserverapplication.cpp
index db50329..2370cb5 100644
--- a/server/remoteproxyserverapplication.cpp
+++ b/server/remoteproxyserverapplication.cpp
@@ -1,29 +1,26 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* This file is part of nymea-remoteproxy.
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* nymea-remoteproxy 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 3 of the License, or
+* (at your option) any later version.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy 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.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* You should have received a copy of the GNU General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "remoteproxyserverapplication.h"
 #include "loggingcategories.h"
diff --git a/server/remoteproxyserverapplication.h b/server/remoteproxyserverapplication.h
index 795c4a0..9c53d20 100644
--- a/server/remoteproxyserverapplication.h
+++ b/server/remoteproxyserverapplication.h
@@ -1,29 +1,26 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* This file is part of nymea-remoteproxy.
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* nymea-remoteproxy 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 3 of the License, or
+* (at your option) any later version.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy 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.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* You should have received a copy of the GNU General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef REMOTEPROXYSERVERAPPLICATION_H
 #define REMOTEPROXYSERVERAPPLICATION_H
diff --git a/tests/test-online/nymea-remoteproxy-tests-online.cpp b/tests/test-online/nymea-remoteproxy-tests-online.cpp
index 70e6544..27e1b6e 100644
--- a/tests/test-online/nymea-remoteproxy-tests-online.cpp
+++ b/tests/test-online/nymea-remoteproxy-tests-online.cpp
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2020, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy 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 3 of the License, or
+* (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "engine.h"
 #include "loggingcategories.h"
diff --git a/tests/test-online/nymea-remoteproxy-tests-online.h b/tests/test-online/nymea-remoteproxy-tests-online.h
index 2d1edc0..003bd8a 100644
--- a/tests/test-online/nymea-remoteproxy-tests-online.h
+++ b/tests/test-online/nymea-remoteproxy-tests-online.h
@@ -1,29 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2020, nymea GmbH
-*  Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* This file is part of nymea-remoteproxy.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy 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 3 of the License, or
+* (at your option) any later version.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* nymea-remoteproxy 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 nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef NYMEA_REMOTEPROXY_TESTS_ONLINE_H
 #define NYMEA_REMOTEPROXY_TESTS_ONLINE_H
diff --git a/tests/test-tunnelproxy/remoteproxyteststunnelproxy.cpp b/tests/test-tunnelproxy/remoteproxyteststunnelproxy.cpp
index 8a44e54..57a6628 100644
--- a/tests/test-tunnelproxy/remoteproxyteststunnelproxy.cpp
+++ b/tests/test-tunnelproxy/remoteproxyteststunnelproxy.cpp
@@ -1,33 +1,29 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2022, nymea GmbH
-*  Contact: contact@nymea.io
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* This file is part of nymea-remoteproxy.
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* nymea-remoteproxy 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 3 of the License, or
+* (at your option) any later version.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy 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.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* You should have received a copy of the GNU General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "remoteproxyteststunnelproxy.h"
 
-
 #include "engine.h"
 #include "loggingcategories.h"
 #include "../common/slipdataprocessor.h"
diff --git a/tests/test-tunnelproxy/remoteproxyteststunnelproxy.h b/tests/test-tunnelproxy/remoteproxyteststunnelproxy.h
index ce69a50..e92ab6f 100644
--- a/tests/test-tunnelproxy/remoteproxyteststunnelproxy.h
+++ b/tests/test-tunnelproxy/remoteproxyteststunnelproxy.h
@@ -1,29 +1,26 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2022, nymea GmbH
-*  Contact: contact@nymea.io
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* This file is part of nymea-remoteproxy.
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* nymea-remoteproxy 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 3 of the License, or
+* (at your option) any later version.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy 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.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* You should have received a copy of the GNU General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef REMOTEPROXYTESTSTUNNELPROXY_H
 #define REMOTEPROXYTESTSTUNNELPROXY_H
diff --git a/tests/testbase/basetest.cpp b/tests/testbase/basetest.cpp
index 381a329..53197e7 100644
--- a/tests/testbase/basetest.cpp
+++ b/tests/testbase/basetest.cpp
@@ -1,29 +1,26 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* This file is part of nymea-remoteproxy.
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* nymea-remoteproxy 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 3 of the License, or
+* (at your option) any later version.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy 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.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* You should have received a copy of the GNU General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "basetest.h"
 
diff --git a/tests/testbase/basetest.h b/tests/testbase/basetest.h
index 3fc51c7..255f394 100644
--- a/tests/testbase/basetest.h
+++ b/tests/testbase/basetest.h
@@ -1,29 +1,26 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* This file is part of nymea-remoteproxy.
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* nymea-remoteproxy 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 3 of the License, or
+* (at your option) any later version.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy 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.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* You should have received a copy of the GNU General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef BASETEST_H
 #define BASETEST_H
diff --git a/tunnelclient/clientconnection.cpp b/tunnelclient/clientconnection.cpp
index e4f10d5..8d0bb16 100644
--- a/tunnelclient/clientconnection.cpp
+++ b/tunnelclient/clientconnection.cpp
@@ -1,3 +1,27 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+*
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
+*
+* This file is part of nymea-remoteproxy.
+*
+* nymea-remoteproxy 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 3 of the License, or
+* (at your option) any later version.
+*
+* nymea-remoteproxy 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 nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
 #include "clientconnection.h"
 
 ClientConnection::ClientConnection(const QUrl &serverUrl, const QString &name, const QUuid &uuid, const QUuid &serverUuid, bool insecure, bool sendRandomData, QObject *parent) :
diff --git a/tunnelclient/clientconnection.h b/tunnelclient/clientconnection.h
index fd75d4a..23fc475 100644
--- a/tunnelclient/clientconnection.h
+++ b/tunnelclient/clientconnection.h
@@ -1,3 +1,27 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+*
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
+*
+* This file is part of nymea-remoteproxy.
+*
+* nymea-remoteproxy 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 3 of the License, or
+* (at your option) any later version.
+*
+* nymea-remoteproxy 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 nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
 #ifndef CLIENTCONNECTION_H
 #define CLIENTCONNECTION_H
 
diff --git a/tunnelclient/main.cpp b/tunnelclient/main.cpp
index c16485e..d77181e 100644
--- a/tunnelclient/main.cpp
+++ b/tunnelclient/main.cpp
@@ -1,29 +1,26 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-*  Copyright 2013 - 2023, nymea GmbH
-*  Contact: contact@nymea.io
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-*  This file is part of nymea.
-*  This project including source code and documentation is protected by copyright law, and
-*  remains the property of nymea GmbH. All rights, including reproduction, publication,
-*  editing and translation, are reserved. The use of this project is subject to the terms of a
-*  license agreement to be concluded with nymea GmbH in accordance with the terms
-*  of use of nymea GmbH, available under https://nymea.io/license
+* This file is part of nymea-remoteproxy.
 *
-*  GNU General Public License Usage
-*  Alternatively, this project may be redistributed and/or modified under
-*  the terms of the GNU General Public License as published by the Free Software Foundation,
-*  GNU version 3. this project 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.
+* nymea-remoteproxy 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 3 of the License, or
+* (at your option) any later version.
 *
-*  You should have received a copy of the GNU General Public License along with this project.
-*  If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy 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.
 *
-*  For any further details and any questions please contact us under contact@nymea.io
-*  or see our FAQ/Licensing Information on https://nymea.io/license/faq
+* You should have received a copy of the GNU General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include <QUrl>
 #include <QUuid>
diff --git a/tunnelclient/serverconnection.cpp b/tunnelclient/serverconnection.cpp
index 2144fb7..3ac8d60 100644
--- a/tunnelclient/serverconnection.cpp
+++ b/tunnelclient/serverconnection.cpp
@@ -1,3 +1,27 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+*
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
+*
+* This file is part of nymea-remoteproxy.
+*
+* nymea-remoteproxy 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 3 of the License, or
+* (at your option) any later version.
+*
+* nymea-remoteproxy 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 nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
 #include "serverconnection.h"
 
 ServerConnection::ServerConnection(const QUrl &serverUrl, const QString &name, const QUuid &uuid, bool insecure, bool echo, QObject *parent) :
diff --git a/tunnelclient/serverconnection.h b/tunnelclient/serverconnection.h
index 99162b5..1572985 100644
--- a/tunnelclient/serverconnection.h
+++ b/tunnelclient/serverconnection.h
@@ -1,3 +1,27 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+*
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
+*
+* This file is part of nymea-remoteproxy.
+*
+* nymea-remoteproxy 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 3 of the License, or
+* (at your option) any later version.
+*
+* nymea-remoteproxy 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 nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
 #ifndef SERVERCONNECTION_H
 #define SERVERCONNECTION_H
 
diff --git a/version.h.in b/version.h.in
index a55cabb..fe8fbc2 100644
--- a/version.h.in
+++ b/version.h.in
@@ -1,32 +1,29 @@
+// SPDX-License-Identifier: LGPL-3.0-or-later
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2023, nymea GmbH
-* Contact: contact@nymea.io
+* nymea-remoteproxy
+* Tunnel proxy server for the nymea remote access
 *
-* This file is part of nymea.
-* This project including source code and documentation is protected by
-* copyright law, and remains the property of nymea GmbH. All rights, including
-* reproduction, publication, editing and translation, are reserved. The use of
-* this project is subject to the terms of a license agreement to be concluded
-* with nymea GmbH in accordance with the terms of use of nymea GmbH, available
-* under https://nymea.io/license
+* Copyright (C) 2013 - 2024, nymea GmbH
+* Copyright (C) 2024 - 2025, chargebyte austria GmbH
 *
-* GNU General Public License Usage
-* Alternatively, this project may be redistributed and/or modified under the
-* terms of the GNU General Public License as published by the Free Software
-* Foundation, GNU version 3. This project 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.
+* This file is part of nymea-remoteproxy.
 *
-* You should have received a copy of the GNU General Public License along with
-* this project. If not, see <https://www.gnu.org/licenses/>.
+* nymea-remoteproxy is free software: you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public License
+* as published by the Free Software Foundation, either version 3
+* of the License, or (at your option) any later version.
 *
-* For any further details and any questions please contact us under
-* contact@nymea.io or see our FAQ/Licensing Information on
-* https://nymea.io/license/faq
+* nymea-remoteproxy 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 Lesser General Public License for more details.
 *
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+* You should have received a copy of the GNU Lesser General Public License
+* along with nymea-remoteproxy. If not, see <https://www.gnu.org/licenses/>.
+*
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef VERSION_H
 #define VERSION_H