diff --git a/apps/eclipse-mosquitto/config.json b/apps/eclipse-mosquitto/config.json
index 6f4a7934..a4aa4e42 100755
--- a/apps/eclipse-mosquitto/config.json
+++ b/apps/eclipse-mosquitto/config.json
@@ -12,7 +12,7 @@
     "automation"
   ],
   "description": "Eclipse Mosquitto is an open source message broker that implements the MQTT protocol.",
-  "short_desc": "open source message broker",
+  "short_desc": "The MQTT protocol provides a lightweight method of carrying out messaging using a publish/subscribe model.",
   "author": "Eclipse Foundation",
   "source": "https://github.com/eclipse/mosquitto/",
   "website": "https://mosquitto.org/",
@@ -24,6 +24,14 @@
       "min": 6,
       "required": true,
       "env_variable": "MQTT_ADMIN_PASSWORD"
+    },
+    {
+      "type": "password",
+      "label": "Cedalo Management Center Password",
+      "max": 50,
+      "min": 6,
+      "required": true,
+      "env_variable": "CEDALO_MC_PASSWORD"
     }
   ],
   "supported_architectures": [
diff --git a/apps/eclipse-mosquitto/docker-compose.yml b/apps/eclipse-mosquitto/docker-compose.yml
index 925014ae..948aefe2 100755
--- a/apps/eclipse-mosquitto/docker-compose.yml
+++ b/apps/eclipse-mosquitto/docker-compose.yml
@@ -22,17 +22,17 @@ services:
       - tipi_main_network
 
   mosquitto-management-center:
-    image: cedalo/management-center:dev
+    image: cedalo/management-center:2
     container_name: mosquitto-management-center
     environment:
       - TZ=${TZ}
       - CEDALO_MC_BROKER_ID=mosquitto-broker
       - CEDALO_MC_BROKER_NAME=mosquitto-broker-2
-      - CEDALO_MC_BROKER_URL=mqtt://mosquitto-broker:1883
+      - CEDALO_MC_BROKER_URL=mqtt://${INTERNAL_IP}:1883
       - CEDALO_MC_BROKER_USERNAME=admin
       - CEDALO_MC_BROKER_PASSWORD=${MQTT_ADMIN_PASSWORD}
       - CEDALO_MC_USERNAME=admin
-      - CEDALO_MC_PASSWORD=admin
+      - CEDALO_MC_PASSWORD=${CEDALO_MC_PASSWORD}
     ports:
       - ${APP_PORT}:8088
     expose:
diff --git a/apps/eclipse-mosquitto/metadata/caledo_mgm_center.png b/apps/eclipse-mosquitto/metadata/cedalo_mgm_center.png
similarity index 100%
rename from apps/eclipse-mosquitto/metadata/caledo_mgm_center.png
rename to apps/eclipse-mosquitto/metadata/cedalo_mgm_center.png
diff --git a/apps/eclipse-mosquitto/metadata/description.md b/apps/eclipse-mosquitto/metadata/description.md
index 71db6cff..f8678910 100755
--- a/apps/eclipse-mosquitto/metadata/description.md
+++ b/apps/eclipse-mosquitto/metadata/description.md
@@ -1,7 +1,7 @@
 # Eclipse Mosquitto MQTT Broker with UI
 
-this app consists of two images providing an mqtt broker and an UI for managing access to the broker.
-The configuration is adapted from the github repo: [shantanoo-desai/mqtt-rbac-docker-init](https://github.com/shantanoo-desai/mqtt-rbac-docker-init)
+This app consists of two images providing an MQTT broker and a UI for managing access to the broker.
+The configuration is adapted from the GitHub repo: [shantanoo-desai/mqtt-rbac-docker-init](https://github.com/shantanoo-desai/mqtt-rbac-docker-init)
 
 
 ## Eclipse Mosquitto
@@ -27,7 +27,7 @@ For more detailed information the [mosquitto documentation](https://mosquitto.or
 
 [Cedalo Management Center](https://github.com/cedalo/management-center) allows to easily manage, monitor and inspect instances of Eclipse Mosquitto. There are some pro features that can only be activated by getting a license from cedalo.
 
-![caledo_mgm_center.png](caledo_mgm_center.png)
+![cedalo_mgm_center.png](https://github.com/runtipi/runtipi-appstore/blob/master/apps/eclipse-mosquitto/metadata/cedalo_mgm_center.png)
 
 By default the following features are provided: