diff --git a/LICENSE.md b/LICENSE.md
index 0f84944..cbec999 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
 # NEON AI (TM) SOFTWARE, Software Development Kit & Application Development System
 # All trademark and other rights reserved by their respective owners
-# Copyright 2008-2021 Neongecko.com Inc.
+# Copyright 2008-2025 Neongecko.com Inc.
 # BSD-3 License
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
diff --git a/docker_overlay/root/run.sh b/docker_overlay/root/run.sh
index b7b3000..314a8c0 100755
--- a/docker_overlay/root/run.sh
+++ b/docker_overlay/root/run.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework
 # All trademark and other rights reserved by their respective owners
-# Copyright 2008-2022 Neongecko.com Inc.
+# Copyright 2008-2025 Neongecko.com Inc.
 # Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds,
 # Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo
 # BSD-3 License
diff --git a/neon_enclosure/__init__.py b/neon_enclosure/__init__.py
index 718d1b0..5694901 100644
--- a/neon_enclosure/__init__.py
+++ b/neon_enclosure/__init__.py
@@ -1,6 +1,6 @@
 # NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework
 # All trademark and other rights reserved by their respective owners
-# Copyright 2008-2022 Neongecko.com Inc.
+# Copyright 2008-2025 Neongecko.com Inc.
 # Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds,
 # Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo
 # BSD-3 License
diff --git a/neon_enclosure/__main__.py b/neon_enclosure/__main__.py
index 8cd7b50..889f7f4 100644
--- a/neon_enclosure/__main__.py
+++ b/neon_enclosure/__main__.py
@@ -1,6 +1,6 @@
 # NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework
 # All trademark and other rights reserved by their respective owners
-# Copyright 2008-2022 Neongecko.com Inc.
+# Copyright 2008-2025 Neongecko.com Inc.
 # Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds,
 # Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo
 # BSD-3 License
diff --git a/neon_enclosure/admin/__init__.py b/neon_enclosure/admin/__init__.py
index 98aeae1..b39409f 100644
--- a/neon_enclosure/admin/__init__.py
+++ b/neon_enclosure/admin/__init__.py
@@ -1,6 +1,6 @@
 # NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework
 # All trademark and other rights reserved by their respective owners
-# Copyright 2008-2022 Neongecko.com Inc.
+# Copyright 2008-2025 Neongecko.com Inc.
 # Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds,
 # Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo
 # BSD-3 License
diff --git a/neon_enclosure/admin/__main__.py b/neon_enclosure/admin/__main__.py
index 5e3d9f2..449a789 100644
--- a/neon_enclosure/admin/__main__.py
+++ b/neon_enclosure/admin/__main__.py
@@ -1,6 +1,6 @@
 # NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework
 # All trademark and other rights reserved by their respective owners
-# Copyright 2008-2022 Neongecko.com Inc.
+# Copyright 2008-2025 Neongecko.com Inc.
 # Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds,
 # Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo
 # BSD-3 License
diff --git a/neon_enclosure/admin/service.py b/neon_enclosure/admin/service.py
index 661440f..069fc85 100644
--- a/neon_enclosure/admin/service.py
+++ b/neon_enclosure/admin/service.py
@@ -1,6 +1,6 @@
 # NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework
 # All trademark and other rights reserved by their respective owners
-# Copyright 2008-2022 Neongecko.com Inc.
+# Copyright 2008-2025 Neongecko.com Inc.
 # Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds,
 # Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo
 # BSD-3 License
diff --git a/neon_enclosure/cli.py b/neon_enclosure/cli.py
index 64abc82..adef0fd 100644
--- a/neon_enclosure/cli.py
+++ b/neon_enclosure/cli.py
@@ -1,6 +1,6 @@
 # NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework
 # All trademark and other rights reserved by their respective owners
-# Copyright 2008-2022 Neongecko.com Inc.
+# Copyright 2008-2025 Neongecko.com Inc.
 # Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds,
 # Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo
 # BSD-3 License
@@ -25,16 +25,22 @@
 # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # SOFTWARE,  EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 import click
 import sys
 
+from os import environ
 from click_default_group import DefaultGroup
 from neon_utils.packaging_utils import get_package_version_spec
-from neon_utils.configuration_utils import init_config_dir
 from ovos_utils.log import LOG
 from ovos_config.config import Configuration
 from typing import List
 
+
+environ.setdefault("OVOS_CONFIG_BASE_FOLDER", "neon")
+environ.setdefault("OVOS_CONFIG_FILENAME", "neon.yaml")
+
+
 @click.group("neon-enclosure", cls=DefaultGroup,
              no_args_is_help=True, invoke_without_command=True,
              help="Neon Enclosure Commands\n\n"
@@ -46,6 +52,7 @@ def neon_enclosure_cli(version: bool = False):
         click.echo(f"neon_enclosure version "
                    f"{get_package_version_spec('neon_enclosure')}")
 
+
 @neon_enclosure_cli.command(help="Install neon-enclosure module dependencies from config & cli")
 @click.option("--package", "-p", default=[], multiple=True,
               help="Additional package to install (can be repeated)")
@@ -58,9 +65,9 @@ def install_dependencies(package: List[str]):
     LOG.info(f"pip exit code: {result}")
     sys.exit(result)
 
+
 @neon_enclosure_cli.command(help="Start Neon Enclosure module")
 def run():
-    init_config_dir()
     from neon_enclosure.__main__ import main
     click.echo("Starting Enclosure Service")
     main()
@@ -73,7 +80,6 @@ def run_admin():
     if geteuid() != 0:
         click.echo("Admin enclosure must be started as `root`")
         exit(1)
-    init_config_dir()
     from neon_enclosure.admin.__main__ import main
     click.echo("Starting Admin Enclosure Service")
     main()
diff --git a/neon_enclosure/service.py b/neon_enclosure/service.py
index 82ce5cb..b7f554e 100644
--- a/neon_enclosure/service.py
+++ b/neon_enclosure/service.py
@@ -1,6 +1,6 @@
 # NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework
 # All trademark and other rights reserved by their respective owners
-# Copyright 2008-2022 Neongecko.com Inc.
+# Copyright 2008-2025 Neongecko.com Inc.
 # Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds,
 # Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo
 # BSD-3 License
diff --git a/neon_enclosure/utils.py b/neon_enclosure/utils.py
index 8c15d8b..c27132e 100644
--- a/neon_enclosure/utils.py
+++ b/neon_enclosure/utils.py
@@ -1,6 +1,6 @@
 # NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework
 # All trademark and other rights reserved by their respective owners
-# Copyright 2008-2022 Neongecko.com Inc.
+# Copyright 2008-2025 Neongecko.com Inc.
 # Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds,
 # Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo
 # BSD-3 License
diff --git a/setup.py b/setup.py
index 2a8e9ad..20fac7d 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 # NEON AI (TM) SOFTWARE, Software Development Kit & Application Development System
 # All trademark and other rights reserved by their respective owners
-# Copyright 2008-2021 Neongecko.com Inc.
+# Copyright 2008-2025 Neongecko.com Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/tests/test_enclosure_service.py b/tests/test_enclosure_service.py
index b6ede37..7eb4b8a 100644
--- a/tests/test_enclosure_service.py
+++ b/tests/test_enclosure_service.py
@@ -1,6 +1,6 @@
 # NEON AI (TM) SOFTWARE, Software Development Kit & Application Framework
 # All trademark and other rights reserved by their respective owners
-# Copyright 2008-2022 Neongecko.com Inc.
+# Copyright 2008-2025 Neongecko.com Inc.
 # Contributors: Daniel McKnight, Guy Daniels, Elon Gasper, Richard Leeds,
 # Regina Bloomstine, Casimiro Ferreira, Andrii Pernatii, Kirill Hrymailo
 # BSD-3 License
diff --git a/version.py b/version.py
index e05aade..cc2ae7e 100644
--- a/version.py
+++ b/version.py
@@ -1,6 +1,6 @@
 # NEON AI (TM) SOFTWARE, Software Development Kit & Application Development System
 # All trademark and other rights reserved by their respective owners
-# Copyright 2008-2021 Neongecko.com Inc.
+# Copyright 2008-2025 Neongecko.com Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.