diff --git a/CHANGELOG b/CHANGELOG
index 03e7944..41db115 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -199,3 +199,20 @@
 * Update Prometheus to 2.35.0
 * [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.35.0)
 
+[1.4.0]
+* Update Prometheus to 2.36.0
+* [Full changelog](https://github.com/prometheus/prometheus/releases/tag/v2.36.0)
+* [FEATURE] Add lowercase and uppercase relabel action. #10641
+* [FEATURE] SD: Add IONOS Cloud integration. #10514
+* [FEATURE] SD: Add Vultr integration. #10714
+* [FEATURE] SD: Add Linode SD failure count metric. #10673
+* [FEATURE] Add prometheus_ready metric. #10682
+* [ENHANCEMENT] Add stripDomain to template function. #10475
+* [ENHANCEMENT] UI: Enable active search through dropped targets. #10668
+* [ENHANCEMENT] promtool: support matchers when querying label values. #10727
+* [ENHANCEMENT] Add agent mode identifier. #9638
+* [BUGFIX] Changing TotalQueryableSamples from int to int64. #10549
+* [BUGFIX] tsdb/agent: Ignore duplicate exemplars. #10595
+* [BUGFIX] TSDB: Fix chunk overflow appending samples at a variable rate. #10607
+* [BUGFIX] Stop rule manager before TSDB is stopped. #10680
+
diff --git a/CloudronManifest.json b/CloudronManifest.json
index 202f6a7..cac2c22 100644
--- a/CloudronManifest.json
+++ b/CloudronManifest.json
@@ -1,6 +1,6 @@
 {
-  "version": "1.13.1",
-  "upstreamVersion": "2.35.0",
+  "version": "1.14.0",
+  "upstreamVersion": "2.36.0",
   "id": "io.prometheus.cloudronapp",
   "title": "Prometheus Server",
   "author": "Erik Tadevosyan",
diff --git a/Dockerfile b/Dockerfile
index 1058ffa..d324bdc 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.35.0
+ARG VERSION=2.36.0
 
 RUN curl -L https://github.com/prometheus/prometheus/releases/download/v${VERSION}/prometheus-${VERSION}.linux-amd64.tar.gz | tar zxvf - --strip-components 1