diff --git a/zoneminder/CHANGELOG.md b/zoneminder/CHANGELOG.md
index 2920add01..1d5f8fe19 100644
--- a/zoneminder/CHANGELOG.md
+++ b/zoneminder/CHANGELOG.md
@@ -1,4 +1,7 @@
 
+## 1.36.21 (26-07-2022)
+- Update to latest version from zoneminder-containers/zoneminder-base
+
 ## 1.36.20 (16-07-2022)
 - Update to latest version from zoneminder-containers/zoneminder-base
 
diff --git a/zoneminder/Dockerfile b/zoneminder/Dockerfile
index a0dc33127..a7715acdf 100644
--- a/zoneminder/Dockerfile
+++ b/zoneminder/Dockerfile
@@ -16,7 +16,7 @@
 
 ARG BUILD_FROM
 ARG BUILD_VERSION
-ARG BUILD_UPSTREAM="1.36.20"
+ARG BUILD_UPSTREAM="1.36.21"
 FROM tritruongtr/zoneminder:latest
 
 ##################
diff --git a/zoneminder/config.json b/zoneminder/config.json
index 80421fc1e..6f6495ced 100644
--- a/zoneminder/config.json
+++ b/zoneminder/config.json
@@ -37,6 +37,6 @@
   ],
   "slug": "zoneminder",
   "url": "https://github.com/alexbelgium/hassio-addons",
-  "version": "1.36.20",
+  "version": "1.36.21",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:80]/zm"
 }
diff --git a/zoneminder/updater.json b/zoneminder/updater.json
index 1550a32d0..fdd514d5a 100644
--- a/zoneminder/updater.json
+++ b/zoneminder/updater.json
@@ -1,8 +1,8 @@
 {
-  "last_update": "16-07-2022",
+  "last_update": "26-07-2022",
   "repository": "alexbelgium/hassio-addons",
   "slug": "zoneminder",
   "source": "github",
   "upstream_repo": "zoneminder-containers/zoneminder-base",
-  "upstream_version": "1.36.20"
+  "upstream_version": "1.36.21"
 }