diff --git a/images/eclipse-mosquitto.png b/images/eclipse-mosquitto.png
new file mode 100644
index 0000000..eb287a7
Binary files /dev/null and b/images/eclipse-mosquitto.png differ
diff --git a/template/apps/eclipse-mosquitto.json b/template/apps/eclipse-mosquitto.json
index ae4567f..ed093de 100644
--- a/template/apps/eclipse-mosquitto.json
+++ b/template/apps/eclipse-mosquitto.json
@@ -1,34 +1,33 @@
 {
 	"categories": [
-		"Other",
 		"Tools"
 	],
-	"description": "Eclipse Mosquitto is an open source implementation of a server for versions 5, 3.1.1, and 3.1 of the MQTT protocol.\r\nYou will need to create /portainer/Files/AppData/Config/Mosquitto/config/mosquitto.conf and if needed your password file.\r\nHave a look on https://mosquitto.org/man/mosquitto_passwd-1.html",
-	"hostname": "rpi-mosquitto",
-	"image_arm32": "eclipse-mosquitto:latest",
-	"image_arm64": "eclipse-mosquitto:latest",
-	"image_amd64": "eclipse-mosquitto:latest",
-	"logo": "https://raw.githubusercontent.com/docker-library/docs/757578e3a44e5460a8a11d32a81776f8b74231a9/eclipse-mosquitto/logo.png",
-	"name": "mosquitto",
-	"officialDoc": "https://hub.docker.com/_/eclipse-mosquitto",
+	"description": "Eclipse Mosquitto is an open source message broker that implements the MQTT protocol versions 5.0, 3.1.1 and 3.1. Mosquitto is lightweight and is suitable for use on all devices from low power single board computers to full servers.",
+        "image_arm32": "eclipse-mosquitto:latest",
+        "image_arm64": "eclipse-mosquitto:latest",
+        "image_amd64": "eclipse-mosquitto:latest",
+	"logo": "https://raw.githubusercontent.com/pi-hosted/pi-hosted/master/images/eclipse-mosquitto.png",
+	"name": "eclipse-mosquitto",
+	"officialDoc": "https://mosquitto.org/",
 	"platform": "linux",
 	"ports": [
-		"1883:1883/tcp"
+		"1883:1883/tcp",
+		"9001:9001/tcp"
 	],
 	"restart_policy": "unless-stopped",
-	"title": "Eclipse Mosquitto",
+	"title": "Eclipse Mosquitto MQTT",
 	"type": 1,
 	"volumes": [
 		{
-			"bind": "/portainer/Files/AppData/Config/Mosquitto/config",
+			"bind": "/portainer/Files/AppData/Config/eclipse-mosquitto/config",
 			"container": "/mosquitto/config"
 		},
 		{
-			"bind": "/portainer/Files/AppData/Config/Mosquitto/data",
+			"bind": "/portainer/Files/AppData/Config/eclipse-mosquitto/data",
 			"container": "/mosquitto/data"
 		},
 		{
-			"bind": "/portainer/Files/AppData/Config/Mosquitto/log",
+			"bind": "/portainer/Files/AppData/Config/eclipse-mosquitto/log",
 			"container": "/mosquitto/log"
 		}
 	],
diff --git a/template/apps/filebrowser.json b/template/apps/filebrowser.json
index ef7eb85..1675e96 100644
--- a/template/apps/filebrowser.json
+++ b/template/apps/filebrowser.json
@@ -3,12 +3,12 @@
 		"Other",
 		"Tools"
 	],
-	"description": "[arm] Web File Browser which can be used as a middleware or standalone app.",
+	"description": "Web File Browser which can be used as a middleware or standalone app.",
 	"image_arm32": "filebrowser/filebrowser:latest",
 	"image_arm64": "filebrowser/filebrowser:latest",
 	"image_amd64": "filebrowser/filebrowser:latest",
 	"logo": "https://raw.githubusercontent.com/pi-hosted/pi-hosted/master/images/filebrowser.png",
-	"name": "filebrowser",
+	"name": "filebrowser-latest",
 	"note": "The default user and password is admin/admin.",
 	"officialDoc": "https://filebrowser.org/installation#docker",
 	"platform": "linux",
@@ -16,7 +16,7 @@
 		"8082:80/tcp"
 	],
 	"restart_policy": "unless-stopped",
-	"title": "FileBrowser",
+	"title": "FileBrowser latest",
 	"type": 1,
 	"videoID": "N.04",
         "volumes": [