diff --git a/modules/mosquitto/README.rst b/modules/mosquitto/README.rst
new file mode 100644
index 00000000..6a587292
--- /dev/null
+++ b/modules/mosquitto/README.rst
@@ -0,0 +1,2 @@
+.. autoclass:: testcontainers.mosquitto.MosquittoContainer
+.. title:: testcontainers.mosquitto.MosquittoContainer
diff --git a/modules/mqtt/testcontainers/mqtt/__init__.py b/modules/mosquitto/testcontainers/mosquitto/__init__.py
similarity index 98%
rename from modules/mqtt/testcontainers/mqtt/__init__.py
rename to modules/mosquitto/testcontainers/mosquitto/__init__.py
index 1382762a..d3c3fafd 100644
--- a/modules/mqtt/testcontainers/mqtt/__init__.py
+++ b/modules/mosquitto/testcontainers/mosquitto/__init__.py
@@ -31,7 +31,7 @@ class MosquittoContainer(DockerContainer):
 
         .. doctest::
 
-            >>> from testcontainers.mqtt import MosquittoContainer
+            >>> from testcontainers.mosquitto import MosquittoContainer
 
             >>> with MosquittoContainer() as mosquitto_broker:
             ...     mqtt_client = mosquitto_broker.get_client()
diff --git a/modules/mqtt/testcontainers/mqtt/testcontainers-mosquitto-default-configuration.conf b/modules/mosquitto/testcontainers/mosquitto/testcontainers-mosquitto-default-configuration.conf
similarity index 100%
rename from modules/mqtt/testcontainers/mqtt/testcontainers-mosquitto-default-configuration.conf
rename to modules/mosquitto/testcontainers/mosquitto/testcontainers-mosquitto-default-configuration.conf
diff --git a/modules/mqtt/tests/test_mosquitto.py b/modules/mosquitto/tests/test_mosquitto.py
similarity index 90%
rename from modules/mqtt/tests/test_mosquitto.py
rename to modules/mosquitto/tests/test_mosquitto.py
index 63ce7fcd..042b45fb 100644
--- a/modules/mqtt/tests/test_mosquitto.py
+++ b/modules/mosquitto/tests/test_mosquitto.py
@@ -1,6 +1,6 @@
 import pytest
 
-from testcontainers.mqtt import MosquittoContainer
+from testcontainers.mosquitto import MosquittoContainer
 
 VERSIONS = ["1.6.15", "2.0.18"]
 
diff --git a/modules/mqtt/README.rst b/modules/mqtt/README.rst
deleted file mode 100644
index 2e088cbb..00000000
--- a/modules/mqtt/README.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-.. autoclass:: testcontainers.mqtt.MosquittoContainer
-.. title:: testcontainers.mqtt.MosquittoContainer
diff --git a/poetry.lock b/poetry.lock
index bd54659e..f396da54 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -3591,6 +3591,7 @@ files = [
     {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"},
     {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"},
     {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"},
+    {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"},
     {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"},
     {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"},
     {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"},
@@ -4652,7 +4653,7 @@ memcached = []
 milvus = []
 minio = ["minio"]
 mongodb = ["pymongo"]
-mqtt = []
+mosquitto = []
 mssql = ["pymssql", "sqlalchemy"]
 mysql = ["pymysql", "sqlalchemy"]
 nats = ["nats-py"]
@@ -4678,4 +4679,4 @@ weaviate = ["weaviate-client"]
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.9,<4.0"
-content-hash = "5c400cc87dc9708588ee8d7d50646de789235732d868b74ebc43f1cf2a403c88"
+content-hash = "d4dbd10a31ebbfb0fc524ad71fc8977b85cec5eebcb4d43a926927dccee4e78e"
diff --git a/pyproject.toml b/pyproject.toml
index a44cc3a3..9c0fbc64 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -51,7 +51,7 @@ packages = [
     { include = "testcontainers", from = "modules/minio" },
     { include = "testcontainers", from = "modules/milvus" },
     { include = "testcontainers", from = "modules/mongodb" },
-    { include = "testcontainers", from = "modules/mqtt" },
+    { include = "testcontainers", from = "modules/mosquitto" },
     { include = "testcontainers", from = "modules/mssql" },
     { include = "testcontainers", from = "modules/mysql" },
     { include = "testcontainers", from = "modules/nats" },
@@ -143,7 +143,7 @@ memcached = []
 minio = ["minio"]
 milvus = []
 mongodb = ["pymongo"]
-mqtt = []
+mosquitto = []
 mssql = ["sqlalchemy", "pymssql"]
 mysql = ["sqlalchemy", "pymysql"]
 nats = ["nats-py"]