diff --git a/esphome-beta/config.yaml b/esphome-beta/config.yaml
index 6637a5e..b3373d9 100644
--- a/esphome-beta/config.yaml
+++ b/esphome-beta/config.yaml
@@ -34,4 +34,4 @@ slug: esphome-beta
 stage: experimental
 uart: true
 url: https://beta.esphome.io/
-version: 2022.4.0b4
+version: 2022.4.0
diff --git a/esphome/config.yaml b/esphome/config.yaml
index 8aaa9fb..cc693c0 100644
--- a/esphome/config.yaml
+++ b/esphome/config.yaml
@@ -32,4 +32,4 @@ schema:
 slug: esphome
 uart: true
 url: https://esphome.io/
-version: 2022.3.2
+version: 2022.4.0
diff --git a/template/addon_config.yaml b/template/addon_config.yaml
index 001346f..848e53d 100644
--- a/template/addon_config.yaml
+++ b/template/addon_config.yaml
@@ -62,7 +62,7 @@ esphome-beta:
   <<: *base
   directory: esphome-beta
   name: ESPHome (beta)
-  version: '2022.4.0b4'  # BETA
+  version: '2022.4.0'  # BETA
   slug: esphome-beta
   description: "Beta version of ESPHome add-on"
   url: https://beta.esphome.io/
@@ -74,7 +74,7 @@ esphome-stable:
   <<: *base
   directory: esphome
   name: ESPHome
-  version: '2022.3.2'  # STABLE
+  version: '2022.4.0'  # STABLE
   slug: esphome
   description: "ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices"
   image: ghcr.io/esphome/esphome-hassio-{arch}