diff --git a/servapps/ESPHome/cosmos-compose.json b/servapps/ESPHome/cosmos-compose.json
new file mode 100644
index 00000000..0b2bab8a
--- /dev/null
+++ b/servapps/ESPHome/cosmos-compose.json
@@ -0,0 +1,90 @@
+{
+  "cosmos-installer": {
+    "form": [
+      {
+        "name": "storagePath",
+        "label": "Where do you want to store the data ?",
+        "initialValue": "{DefaultDataPath}",
+        "type": "text"
+      },
+      {
+        "name": "useping",
+        "label": "Do you want to use ping instead of mDNS ?",
+        "initialValue": "false",
+        "type": "select",
+        "options": [
+          ["true", "true"],
+          ["false", "false"]
+        ]
+      },
+      {
+        "name": "username",
+        "label": "What should be the username? ",
+        "initialValue": "admin",
+        "type": "text"
+      },
+      {
+        "name": "password",
+        "label": "What should be the password? ",
+        "initialValue": "admin",
+        "type": "text"
+      }
+    ],
+    "post-install": [
+      {
+        "type": "warning",
+        "label": "As it is impossible to include all the configuration options in the installer, After install edit the URL  ESP Home and update http://esphome:6052 to http://<ip-of-cosmos-server>:6052"
+      }
+    ]
+  },
+  "minVersion": "0.9.0",
+  "services": {
+    "{ServiceName}": {
+      "container_name": "{ServiceName}",
+      "image": "ghcr.io/esphome/esphome",
+      "NetworkMode": "host",
+      "volumes": [
+        {
+          "source": "{Context.storagePath}/{ServiceName}",
+          "target": "/config",
+          "type": "bind"
+        },
+        {
+          "source": "/etc/localtime",
+          "target": "/etc/localtime",
+          "type": "bind",
+          "mode": "ro"
+        }
+      ],
+      "restart": "always",
+      "privileged": true,
+      "network_mode": "host",
+      "environment": [
+        "USERNAME={Context.username}",
+        "PASSWORD={Context.password}",
+        "ESPHOME_DASHBOARD_USE_PING={Context.useping}"
+      ],
+      "labels": {
+        "cosmos-force-network-secured": "false",
+        "cosmos-auto-update": "true",
+        "cosmos-icon": "https://azukaar.github.io/cosmos-servapps-official/servapps/ESPHome/icon.png"
+      },
+      "routes": [
+        {
+          "name": "ESP Home",
+          "description": "ESP Home Web UI",
+          "useHost": true,
+          "target": "http://{ServiceName}:6052",
+          "mode": "PROXY",
+          "Timeout": 14400000,
+          "ThrottlePerMinute": 12000,
+          "BlockCommonBots": true,
+          "SmartShield": {
+            "Enabled": true
+          },
+          "AuthEnabled": false
+        }
+      ]
+    }
+  }
+}
diff --git a/servapps/ESPHome/description.json b/servapps/ESPHome/description.json
new file mode 100644
index 00000000..77058e17
--- /dev/null
+++ b/servapps/ESPHome/description.json
@@ -0,0 +1,9 @@
+{
+  "name": "ESPHome",
+  "longDescription": "<p>ESPhome is a platform for creating custom firmware for ESP8266 and ESP32 chips using YAML configuration files. It turns these definitions into C++ firmware for easy integration of various smart devices.</p><p>ESPhome is seamlessly integrated with Home Assistant, an open-source home automation platform. With this integration, devices configured via ESPhome are automatically discovered and added to Home Assistant setups.</p><p>The platform boasts a robust community and extensive documentation. This, along with features like Over-The-Air (OTA) updates, makes ESPhome a favorite among smart home enthusiasts.</p>",
+  "description": "ESPHome is a system to control your microcontrollers by simple yet powerful configuration files and control them remotely through Home Automation systems.",
+  "tags": ["development", "open-source", "cross-platform", "ESPHome", "Home Assistant","windows", "linux", "macos", "docker","automation"],
+  "repository": "https://github.com/esphome/esphome",
+  "image": "https://github.com/esphome/esphome/pkgs/container/esphome",
+  "supported_architectures": ["amd64", "arm64"]
+}
diff --git a/servapps/ESPHome/icon.png b/servapps/ESPHome/icon.png
new file mode 100644
index 00000000..6e6987b7
Binary files /dev/null and b/servapps/ESPHome/icon.png differ
diff --git a/servapps/ESPHome/screenshots/1.png b/servapps/ESPHome/screenshots/1.png
new file mode 100644
index 00000000..3628bd1c
Binary files /dev/null and b/servapps/ESPHome/screenshots/1.png differ