diff --git a/Dockerfile b/Dockerfile
index 4735232..709629d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,8 @@ FROM python:3.8-slim as base
 LABEL vendor=neon.ai \
     ai.neon.name="neon-speech"
 
-ENV NEON_CONFIG_PATH /config
+ENV OVOS_CONFIG_BASE_FOLDER neon
+ENV OVOS_CONFIG_FILENAME neon.yaml
 
 RUN apt-get update && \
   apt-get install -y \
diff --git a/docker_overlay/etc/OpenVoiceOS/ovos.conf b/docker_overlay/etc/OpenVoiceOS/ovos.conf
deleted file mode 100644
index 7a50f1a..0000000
--- a/docker_overlay/etc/OpenVoiceOS/ovos.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "module_overrides": {
-        "neon_core": {
-            "base_folder": "neon",
-            "config_filename": "neon.yaml",
-            "default_config_path": "/usr/local/lib/python3.8/site-packages/mycroft/configuration/mycroft.conf"
-        }
-    },
-    "submodule_mappings": {
-        "neon_speech": "neon_core"
-    }
-}
\ No newline at end of file
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index d60981d..607193d 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -4,7 +4,7 @@ ovos-utils~=0.0.30
 ovos-plugin-manager~=0.0.23
 click~=8.0
 click-default-group~=1.2
-neon-utils[network,audio]~=1.5
+neon-utils[network,audio]~=1.5,>=1.5.1a7
 ovos-config~=0.0.7
 
 ovos-vad-plugin-webrtcvad~=0.0.1
diff --git a/setup.py b/setup.py
index 8dd616a..1f8b078 100644
--- a/setup.py
+++ b/setup.py
@@ -78,6 +78,7 @@ def get_requirements(requirements_filename: str):
     long_description_content_type="text/markdown",
     entry_points={
         'console_scripts': [
+            # TODO: Deprecate `neon_speech_client` entrypoint
             'neon_speech_client=neon_speech.__main__:main',
             'neon-speech=neon_speech.cli:neon_speech_cli'
         ]