diff --git a/esphome/data/.gitkeep b/esphome/data/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/esphome/data/secrets.yaml b/esphome/data/secrets.yaml
new file mode 100644
index 0000000..e69de29
diff --git a/esphome/docker-compose.yml b/esphome/docker-compose.yml
new file mode 100644
index 0000000..44ad82a
--- /dev/null
+++ b/esphome/docker-compose.yml
@@ -0,0 +1,21 @@
+version: "3.7"
+
+services:
+  app_proxy:
+    environment:
+      APP_HOST: $APP_ESPHOME_IP
+      APP_PORT: 6052
+
+  server:
+    image: esphome/esphome:2022.6.2@sha256:1fac6334b85e76c7fd936036891b7a7ee761ee73fd119662b2cb564c3faf818f
+    volumes:
+      - ${APP_DATA_DIR}/data:/config
+      # Needed for flashing new ESPs directly
+      - /dev/ttyUSB0:/dev/ttyUSB0
+    networks:
+      default:
+        ipv4_address: $APP_ESPHOME_IP
+    restart: on-failure
+    # Needed for flashing new ESPs directly
+    device_cgroup_rules:
+      - 'c 188:* rmw' 
diff --git a/esphome/exports.sh b/esphome/exports.sh
new file mode 100644
index 0000000..82d65ef
--- /dev/null
+++ b/esphome/exports.sh
@@ -0,0 +1,2 @@
+export APP_ESPHOME_PORT="6052"
+export APP_ESPHOME_IP="10.21.21.104"
diff --git a/esphome/umbrel-app.yml b/esphome/umbrel-app.yml
new file mode 100644
index 0000000..b6b50ab
--- /dev/null
+++ b/esphome/umbrel-app.yml
@@ -0,0 +1,22 @@
+manifestVersion: 1
+id: esphome
+category: Automation
+name: ESPHome
+version: "2022.6.2"
+tagline: Intelligently manage all your ESP8266/ESP32 devices
+description: >-
+  ESPHome is a system to control your ESP8266/ESP32 by simple yet powerful configuration files and control them remotely through Home Automation systems.
+developer: ESPHome
+website: https://esphome.io
+dependencies: []
+repo: https://github.com/esphome/esphome
+support: https://community.home-assistant.io/c/esphome
+port: 6052
+gallery:
+  - 1.jpg
+  - 2.jpg
+  - 3.jpg
+path: ""
+defaultUsername: ""
+defaultPassword: ""
+torOnly: false