diff --git a/servapps/EMQX/cosmos-compose.json b/servapps/EMQX/cosmos-compose.json
new file mode 100644
index 00000000..86435184
--- /dev/null
+++ b/servapps/EMQX/cosmos-compose.json
@@ -0,0 +1,57 @@
+{
+  "cosmos-installer": {
+    "post-install": [
+      {
+        "type": "info",
+        "label": "The default username is admin and the default password is public. You can change these in the admin panel of the application."
+      }
+    ]
+  },
+  "minVersion": "0.7.6",
+  "services": {
+    "{ServiceName}": {
+      "image": "emqx/emqx:5.3.1",
+      "container_name": "{ServiceName}",
+      "restart": "unless-stopped",
+      "UID": 1000,
+      "GID": 1000,
+      "ports": [
+        "8883:8883/tcp",
+        "8084:8084/tcp",
+        "8083:8083/tcp",
+        "1883:1883/tcp"
+      ],
+      "labels": {
+        "cosmos-auto-update": "true",
+        "cosmos-icon": "https://azukaar.github.io/cosmos-servapps-official/servapps/EMQX/icon.png"
+      },
+      "volumes": [
+        {
+          "source": "{ServiceName}-log",
+          "target": "/opt/emqx/log",
+          "type": "volume"
+        },
+        {
+          "source": "{ServiceName}-data",
+          "target": "/opt/emqx/data",
+          "type": "volume"
+        }
+      ],
+      "routes": [
+        {
+          "name": "{ServiceName}",
+          "description": "Expose {ServiceName} to the web",
+          "useHost": true,
+          "target": "http://{ServiceName}:18083",
+          "mode": "SERVAPP",
+          "Timeout": 14400000,
+          "ThrottlePerMinute": 12000,
+          "BlockCommonBots": true,
+          "SmartShield": {
+            "Enabled": true
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/servapps/EMQX/description.json b/servapps/EMQX/description.json
new file mode 100644
index 00000000..fd700c1c
--- /dev/null
+++ b/servapps/EMQX/description.json
@@ -0,0 +1,9 @@
+{
+  "name": "EMQX",
+  "longDescription": "<p>EMQX is the world's most scalable open-source MQTT broker with a high performance that connects 100M+ IoT devices in 1 cluster, while maintaining 1M message per second throughput and sub-millisecond latency.</p><p>EMQX supports multiple open standard protocols like MQTT, HTTP, QUIC, and WebSocket. It's 100% compliant with MQTT 5.0 and 3.x standard, and secures bi-directional communication with MQTT over TLS/SSL and various authentication mechanisms.</p><p>With the built-in powerful SQL-based rules engine, EMQX can extract, filter, enrich and transform IoT data in real-time. In addition, it ensures high availability and horizontal scalability with a masterless distributed architecture, and provides ops-friendly user experience and great observability.</p> <p>EMQX boasts more than 20K+ enterprise users across 50+ countries and regions, connecting 100M+ IoT devices worldwide, and is trusted by over 400 customers in mission-critical scenarios of IoT, IIoT, connected vehicles, and more, including over 70 Fortune 500 companies like HPE, VMware, Verifone, SAIC Volkswagen, and Ericsson.</p> <p>Default Login : admin/public </p>",
+  "description": "The most scalable open-source MQTT broker for IoT, IIoT, connected vehicles, and more.",
+  "tags": [ "mqtt","emqx","iot","home assistant","smart home",  "home automation"],
+  "repository": "https://github.com/emqx/emqx",
+  "image": "https://hub.docker.com/_/emqx",
+  "supported_architectures": ["amd64", "arm64"]
+}
diff --git a/servapps/EMQX/icon.png b/servapps/EMQX/icon.png
new file mode 100644
index 00000000..73282a77
Binary files /dev/null and b/servapps/EMQX/icon.png differ
diff --git a/servapps/EMQX/screenshots/1.png b/servapps/EMQX/screenshots/1.png
new file mode 100644
index 00000000..92c34f37
Binary files /dev/null and b/servapps/EMQX/screenshots/1.png differ
diff --git a/servapps/EMQX/screenshots/2.png b/servapps/EMQX/screenshots/2.png
new file mode 100644
index 00000000..01fc198a
Binary files /dev/null and b/servapps/EMQX/screenshots/2.png differ