diff --git a/letsencrypt/CHANGELOG.md b/letsencrypt/CHANGELOG.md
index 036dfe18b54..bdc28716cb3 100644
--- a/letsencrypt/CHANGELOG.md
+++ b/letsencrypt/CHANGELOG.md
@@ -1,9 +1,16 @@
 # Changelog
 
-## 5.1.5
+
+## 5.2.1
 
 - Add mijn.host DNS support
 
+## 5.2.0
+
+- Update Certbot/ACME to 2.11.0 & update all plugins to their latest version
+- Update to Python 3.12
+- Update to Alpine 3.20
+
 ## 5.1.4
 
 - Drop Google Domains support (the new operator Squarespace has no ACME support)
diff --git a/letsencrypt/build.yaml b/letsencrypt/build.yaml
index 8217f82e3af..1170c6af376 100644
--- a/letsencrypt/build.yaml
+++ b/letsencrypt/build.yaml
@@ -1,27 +1,27 @@
 ---
 build_from:
-  aarch64: ghcr.io/home-assistant/aarch64-base-python:3.11-alpine3.18
-  amd64: ghcr.io/home-assistant/amd64-base-python:3.11-alpine3.18
-  armhf: ghcr.io/home-assistant/armhf-base-python:3.11-alpine3.18
-  armv7: ghcr.io/home-assistant/armv7-base-python:3.11-alpine3.18
-  i386: ghcr.io/home-assistant/i386-base-python:3.11-alpine3.18
+  aarch64: ghcr.io/home-assistant/aarch64-base-python:3.12-alpine3.20
+  amd64: ghcr.io/home-assistant/amd64-base-python:3.12-alpine3.20
+  armhf: ghcr.io/home-assistant/armhf-base-python:3.12-alpine3.20
+  armv7: ghcr.io/home-assistant/armv7-base-python:3.12-alpine3.20
+  i386: ghcr.io/home-assistant/i386-base-python:3.12-alpine3.20
 codenotary:
   signer: notary@home-assistant.io
   base_image: notary@home-assistant.io
 args:
-  CLOUDFLARE_VERSION: 2.9.11
-  CRYPTOGRAPHY_VERSION: 41.0.5
-  CERTBOT_VERSION: 2.7.4
-  CERTBOT_DNS_AZURE_VERSION: 2.4.0
-  CERTBOT_DNS_CLOUDNS_VERSION: 0.6.0
+  CLOUDFLARE_VERSION: 2.19.4
+  CRYPTOGRAPHY_VERSION: 43.0.1
+  CERTBOT_VERSION: 2.11.0
+  CERTBOT_DNS_AZURE_VERSION: 2.5.0
+  CERTBOT_DNS_CLOUDNS_VERSION: 0.7.0
   CERTBOT_DNS_DESEC_VERSION: 1.2.1
-  CERTBOT_DNS_DIRECTADMIN_VERSION: 1.0.3
+  CERTBOT_DNS_DIRECTADMIN_VERSION: 1.0.4
   CERTBOT_DNS_DUCKDNS_VERSION: 1.3
   CERTBOT_DNS_DYNU_VERSION: 0.0.5
-  CERTBOT_DNS_EASYDNS_VERSION: 0.1.2
+  CERTBOT_DNS_EASYDNS_VERSION: 0.1.4
   CERTBOT_DNS_HE_VERSION: 1.0.0
-  CERTBOT_DNS_HETZNER_VERSION: 2.0.0
-  CERTBOT_DNS_INFOMANIAK_VERSION: 0.2.1
+  CERTBOT_DNS_HETZNER_VERSION: 2.0.1
+  CERTBOT_DNS_INFOMANIAK_VERSION: 0.2.2
   CERTBOT_DNS_INWX_VERSION: 2.2.0
   CERTBOT_DNS_JOKER_VERSION: 1.1.0
   CERTBOT_DNS_MIJN_HOST_VERSION: 0.0.3
@@ -37,5 +37,5 @@ args:
   CERTBOT_DNS_DREAMHOST_VERSION: 1.0
   CERTBOT_DNS_DOMAINOFFENSIVE_VERSION: 2.0.0
   CERTBOT_DNS_PLESK_VERSION: 0.3.0
-  CERTBOT_DNS_GODADDY_VERSION: 2.7.4
-  ACME_VERSION: 2.7.4
+  CERTBOT_DNS_GODADDY_VERSION: 2.8.0
+  ACME_VERSION: 2.11.0
diff --git a/letsencrypt/config.yaml b/letsencrypt/config.yaml
index fb89a0d1d34..9217ab62d8e 100644
--- a/letsencrypt/config.yaml
+++ b/letsencrypt/config.yaml
@@ -1,5 +1,5 @@
 ---
-version: 5.1.4
+version: 5.2.0
 slug: letsencrypt
 name: Let's Encrypt
 description: Manage certificate from Let's Encrypt
diff --git a/ssh/CHANGELOG.md b/ssh/CHANGELOG.md
index c2ffe02b3f3..8d6615eea7c 100644
--- a/ssh/CHANGELOG.md
+++ b/ssh/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 9.15.0
+
+- Upgrade Home Assistant CLI to 4.36.0
+
 ## 9.14.0
 
 - Upgrade Home Assistant CLI to 4.34.0
diff --git a/ssh/build.yaml b/ssh/build.yaml
index 4c4e936de6e..e0062d60ec1 100644
--- a/ssh/build.yaml
+++ b/ssh/build.yaml
@@ -9,6 +9,6 @@ codenotary:
   signer: notary@home-assistant.io
   base_image: notary@home-assistant.io
 args:
-  CLI_VERSION: 4.34.0
+  CLI_VERSION: 4.36.0
   LIBWEBSOCKETS_VERSION: 4.3.3
   TTYD_VERSION: 1.7.4
diff --git a/ssh/config.yaml b/ssh/config.yaml
index 7ee047b534e..fa01e59cb1b 100644
--- a/ssh/config.yaml
+++ b/ssh/config.yaml
@@ -1,5 +1,5 @@
 ---
-version: 9.14.0
+version: 9.15.0
 slug: ssh
 name: Terminal & SSH
 description: Allow logging in remotely to Home Assistant using SSH