diff --git a/docs/source/conf.py b/docs/source/conf.py
index b7eebbc46..14a963021 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -299,7 +299,7 @@ autodoc_mock_imports = [
     'async_lru',
     'bleak',
     'bluetooth_numbers',
-    'TheengsGateway',
+    'TheengsDecoder',
 ]
 
 sys.path.insert(0, os.path.abspath('../..'))
diff --git a/platypush/plugins/bluetooth/_ble/_mappers.py b/platypush/plugins/bluetooth/_ble/_mappers.py
index 391e19fd0..8b0d1866d 100644
--- a/platypush/plugins/bluetooth/_ble/_mappers.py
+++ b/platypush/plugins/bluetooth/_ble/_mappers.py
@@ -7,8 +7,7 @@ from bleak.backends.device import BLEDevice
 from bleak.backends.scanner import AdvertisementData
 from bluetooth_numbers import company
 
-# pylint: disable=no-name-in-module
-from TheengsGateway._decoder import decodeBLE, getAttribute, getProperties
+from TheengsDecoder import decodeBLE, getAttribute, getProperties
 
 from platypush.entities import Entity
 from platypush.entities.batteries import Battery
diff --git a/platypush/plugins/bluetooth/_plugin.py b/platypush/plugins/bluetooth/_plugin.py
index 4e22ee737..c68e20967 100644
--- a/platypush/plugins/bluetooth/_plugin.py
+++ b/platypush/plugins/bluetooth/_plugin.py
@@ -50,7 +50,7 @@ class BluetoothPlugin(RunnablePlugin, EntityManager):
 
         * **bleak** (``pip install bleak``)
         * **bluetooth-numbers** (``pip install bluetooth-numbers``)
-        * **TheengsGateway** (``pip install git+https://github.com/theengs/gateway``)
+        * **TheengsDecoder** (``pip install TheengsDecoder``)
         * **pybluez** (``pip install git+https://github.com/pybluez/pybluez``)
         * **pyobex** (``pip install git+https://github.com/BlackLight/PyOBEX``)
 
diff --git a/platypush/plugins/bluetooth/manifest.yaml b/platypush/plugins/bluetooth/manifest.yaml
index 37014e30a..ccd60db49 100644
--- a/platypush/plugins/bluetooth/manifest.yaml
+++ b/platypush/plugins/bluetooth/manifest.yaml
@@ -16,8 +16,8 @@ manifest:
     pip:
     - bleak
     - bluetooth-numbers
+    - TheengsDecoder
     - git+https://github.com/pybluez/pybluez
-    - git+https://github.com/theengs/gateway
     - git+https://github.com/BlackLight/PyOBEX
   package: platypush.plugins.bluetooth
   type: plugin
diff --git a/setup.py b/setup.py
index e38afc126..83dc025a7 100755
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@ def readfile(fname):
 def pkg_files(dir):
     paths = []
     # noinspection PyShadowingNames
-    for (path, _, files) in os.walk(dir):
+    for path, _, files in os.walk(dir):
         for file in files:
             paths.append(os.path.join('..', path, file))
     return paths
@@ -177,9 +177,9 @@ setup(
         'bluetooth': [
             'bleak',
             'bluetooth-numbers',
+            'TheengsDecoder',
             'pybluez @ https://github.com/pybluez/pybluez/tarball/master',
             'PyOBEX @ https://github.com/BlackLight/PyOBEX/tarball/master',
-            'TheengsGateway @ https://github.com/theengs/gateway/tarball/development',
         ],
         # Support for TP-Link devices
         'tplink': ['pyHS100'],