diff --git a/joplin/CHANGELOG.md b/joplin/CHANGELOG.md
index b0464ff45..ebf768bae 100644
--- a/joplin/CHANGELOG.md
+++ b/joplin/CHANGELOG.md
@@ -1,4 +1,7 @@
 
+## 2.5.8 (31-10-2021)
+- Update to latest version from laurent22/joplin
+
 ## 2.4.12 (14-10-2021)
 - Update to latest version from laurent22/joplin
 
diff --git a/joplin/config.json b/joplin/config.json
index a04d57299..53ad0aea2 100644
--- a/joplin/config.json
+++ b/joplin/config.json
@@ -1,7 +1,7 @@
 {
   "name": "Joplin Server",
-  "version": "2.4.12",
-  "upstream": "2.4.12",
+  "version": "2.5.8",
+  "upstream": "2.5.8",
   "slug": "joplin",
   "description": "Self-hosted open source note-taking application",
   "url": "https://github.com/alexbelgium/hassio-addons",
@@ -13,7 +13,9 @@
   "ports_description": {
     "22300/tcp": "Web interface"
   },
-  "map": ["ssl"],
+  "map": [
+    "ssl"
+  ],
   "environment": {
     "APP_PORT": "22300"
   },
@@ -37,5 +39,10 @@
     "MAILER_NOREPLY_NAME": "str?",
     "MAILER_NOREPLY_EMAIL": "str?"
   },
-  "arch": ["aarch64", "amd64", "armhf", "armv7"]
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf",
+    "armv7"
+  ]
 }