diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77c1c4e..3c6a00e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -291,3 +291,7 @@
 * [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.40.5)
 * [BUGFIX] TSDB: Fix queries involving native histograms due to improper reset of iterators. #11643
 
+[1.18.6]
+* Update Prometheus to 2.40.6
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.40.6)
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index c198f3a..97d9f81 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -1,6 +1,6 @@
 {
-  "version": "1.18.5",
-  "upstreamVersion": "2.40.5",
+  "version": "1.18.6",
+  "upstreamVersion": "2.40.6",
   "id": "io.prometheus.cloudronapp",
   "title": "Prometheus Server",
   "author": "Erik Tadevosyan",
diff --git a/Dockerfile b/Dockerfile
index 1ccee07..936abc5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM cloudron/base:3.2.0@sha256:ba1d566164a67c266782545ea9809dc611c4152e27686fd1
 RUN mkdir -p /app/code /app/pkg
 WORKDIR /app/code
 
-ARG VERSION=2.40.5
+ARG VERSION=2.40.6
 
 RUN curl -L https://github.com/prometheus/prometheus/releases/download/v${VERSION}/prometheus-${VERSION}.linux-amd64.tar.gz | tar zxvf - --strip-components 1