diff --git a/README.md b/README.md
index 225e3e2..87abe17 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,19 @@ docker-compose up
 
 I've complete abandon SemVer because this does not represent the semantic needs for versioning this stack.
 
-### Products-7.8.0-Stack-2.1.0
+### Products-7.13.0-Stack-4.0.0
+
+Update stack from 7.8.0 to 7.13.0.
+
+Adding APM
+
+Adding HeartBeat (for uptime monitoring)
+
+Adding RabbitMQ plugins
+
+Configure Prometheus RabbitMQ integration to expose queue metrics.
+
+### Products-7.8.0-Stack-3.0.0
 
 Update stack from 6.7.0 to 7.8.0.
 
diff --git a/beat/heartbeat/heartbeat.yml b/beat/heartbeat/heartbeat.yml
index 3fa10c8..160d6e0 100644
--- a/beat/heartbeat/heartbeat.yml
+++ b/beat/heartbeat/heartbeat.yml
@@ -4,8 +4,6 @@ heartbeat.monitors:
   urls:
     - http://elasticsearch:9200
     - http://kibana:5601
-    - https://gago.io
-    - https://dockerdefinitivo.com
 
 - type: icmp
   schedule: '@every 5s'
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 29e58f9..047dbfa 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -5,12 +5,14 @@ services:
   rabbitmq:
     container_name: RabbitMQ
     hostname: rabbitmq
-    image: rabbitmq:3-management-alpine
+    build: 
+      context: ./rabbitmq
     volumes:
       - rabbitmq_data:/var/lib/rabbitmq/mnesia
     ports:
-      - "15672:15672"
-      - "5672:5672"
+      - "15672:15672" #management
+      - "15692:15692" #prometheus
+      - "5672:5672"   #amqp
     healthcheck:
       test: ["CMD-SHELL", "curl -I -s -L http://localhost:15672 || exit 1"]
       interval: 30s
diff --git a/rabbitmq/Dockerfile b/rabbitmq/Dockerfile
new file mode 100644
index 0000000..125ee60
--- /dev/null
+++ b/rabbitmq/Dockerfile
@@ -0,0 +1,11 @@
+FROM rabbitmq:3.8-management-alpine
+
+ADD ./rabbitmq.conf /etc/rabbitmq/rabbitmq.conf
+
+RUN rabbitmq-plugins enable --offline \
+rabbitmq_mqtt rabbitmq_web_mqtt \
+rabbitmq_stomp rabbitmq_web_stomp \
+rabbitmq_federation rabbitmq_federation_management \
+rabbitmq_shovel rabbitmq_shovel_management 
+
+RUN apk add curl
\ No newline at end of file
diff --git a/rabbitmq/rabbitmq.conf b/rabbitmq/rabbitmq.conf
new file mode 100644
index 0000000..0ce049b
--- /dev/null
+++ b/rabbitmq/rabbitmq.conf
@@ -0,0 +1,8 @@
+loopback_users.guest = false
+listeners.tcp.default = 5672
+management.tcp.port = 15672
+
+
+prometheus.return_per_object_metrics = true
+prometheus.path = /metrics
+prometheus.tcp.port =  15692
\ No newline at end of file