diff --git a/public/svgs/rabbitmq.svg b/public/svgs/rabbitmq.svg
new file mode 100644
index 000000000..7a94d71bb
--- /dev/null
+++ b/public/svgs/rabbitmq.svg
@@ -0,0 +1 @@
+<svg height="271" preserveAspectRatio="xMidYMid" viewBox="0 0 256 271" width="256" xmlns="http://www.w3.org/2000/svg"><path d="m245.44 108.307692h-85.090462c-4.268307 0-7.734153-3.465846-7.734153-7.734154v-88.6793842c0-6.56738457-5.32677-11.8941538-11.889231-11.8941538h-30.375385c-6.567384 0-11.8892305 5.32676923-11.8892305 11.8941538v88.1427692c0 4.573539-3.6972308 8.290462-8.2707693 8.310154l-27.8843077.132923c-4.612923.024615-8.3593846-3.716923-8.3495384-8.324923l.1723077-88.2412308c.0147692-6.57723082-5.312-11.9138462-11.8892308-11.9138462h-30.3507692c-6.56738465 0-11.8892308 5.32676923-11.8892308 11.8941538v248.3150772c0 5.833846 4.72615385 10.56 10.5550769 10.56h234.8849231c5.833846 0 10.56-4.726154 10.56-10.56v-141.341539c0-5.833846-4.726154-10.56-10.56-10.56zm-39.901538 93.233231c0 7.645539-6.198154 13.843692-13.843693 13.843692h-24.004923c-7.645538 0-13.843692-6.198153-13.843692-13.843692v-24.004923c0-7.645538 6.198154-13.843692 13.843692-13.843692h24.004923c7.645539 0 13.843693 6.198154 13.843693 13.843692z" fill="#f60"/></svg>
\ No newline at end of file
diff --git a/templates/compose/rabbitmq.yaml b/templates/compose/rabbitmq.yaml
index b28171f1a..b8846c8b7 100644
--- a/templates/compose/rabbitmq.yaml
+++ b/templates/compose/rabbitmq.yaml
@@ -1,15 +1,18 @@
-# ignore: true
 # documentation: https://www.rabbitmq.com/documentation.html
 # slogan: With tens of thousands of users, RabbitMQ is one of the most popular open source message brokers.
 # tags: message broker, message queue, message-oriented middleware, MOM, AMQP, MQTT, STOMP, messaging
+# logo: svgs/rabbitmq.svg
+# port: 15672
 
 services:
   rabbitmq:
-    image: rabbitmq:3
+    image: rabbitmq:3-management
     environment:
-      - SERVICE_FQDN_RABBITMQ_5672
+      - SERVICE_FQDN_RABBITMQ_15672
       - RABBITMQ_DEFAULT_USER=$SERVICE_USER_RABBITMQ
       - RABBITMQ_DEFAULT_PASS=$SERVICE_PASSWORD_RABBITMQ
+    ports:
+      - 5672:5672
     healthcheck:
       test: rabbitmq-diagnostics -q ping
       interval: 30s